Configurable wwwroot for StaticWebAssets

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AnotherClassLib/AnotherClassLib.csproj

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+</Project>

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AnotherClassLib/Class2.cs

@@ -0,0 +1,13 @@
+using System;
+using ClassLibrary;
+
+namespace AnotherClassLib
+{
+    public class Class2
+    {
+        public void Method()
+        {
+            Console.WriteLine(typeof(Class1));
+        }
+    }
+}

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AnotherClassLib/Views/Shared/Index.cshtml

@@ -0,0 +1,2 @@
+@{ var message = "Hello world";}
+@message

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AnotherClassLib/Views/_ViewImports.cshtml

@@ -0,0 +1,2 @@
+@using ClassLibrary
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AnotherClassLib/wwwroot/css/site.css

@@ -0,0 +1 @@
+div.fluent { display: inline-block  }

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AnotherClassLib/wwwroot/js/project-direct-dep.js

@@ -0,0 +1,3 @@
+(function () {
+  document.getElementById('project-direct-dep').innerHTML = 'project-direct-dep';
+})()

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AppWithP2PReference/AppWithP2PReference.csproj

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+    <StaticWebAssetRootPath>client</StaticWebAssetRootPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj" />
+    <ProjectReference Include="..\AnotherClassLib\AnotherClassLib.csproj" />
+  </ItemGroup>
+</Project>

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AppWithP2PReference/AppWithP2PReference.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppWithP2PReference", "AppWithP2PReference.csproj", "{8B39F50A-A007-48AE-AC28-7C105B1BE86E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8B39F50A-A007-48AE-AC28-7C105B1BE86E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B39F50A-A007-48AE-AC28-7C105B1BE86E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B39F50A-A007-48AE-AC28-7C105B1BE86E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B39F50A-A007-48AE-AC28-7C105B1BE86E}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {4A225483-0649-465C-B592-89D92B3A3A96}
+	EndGlobalSection
+EndGlobal

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AppWithP2PReference/Models/ErrorViewModel.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace AppWithP2PReference.Models
+{
+    public class ErrorViewModel
+    {
+        public string RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    }
+}

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AppWithP2PReference/Program.cs

@@ -0,0 +1,13 @@
+
+namespace AppWithP2PReference
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to the MvcShim
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AppWithP2PReference/Views/Home/About.cshtml

@@ -0,0 +1,7 @@
+@{
+    ViewData["Title"] = "About";
+}
+<h2>@ViewData["Title"]</h2>
+<h3>@ViewData["Message"]</h3>
+
+<p>Use this area to provide additional information.</p>

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AppWithP2PReference/Views/Home/Contact.cshtml

@@ -0,0 +1,17 @@
+@{
+    ViewData["Title"] = "Contact";
+}
+<h2>@ViewData["Title"]</h2>
+<h3>@ViewData["Message"]</h3>
+
+<address>
+    One Microsoft Way<br />
+    Redmond, WA 98052-6399<br />
+    <abbr title="Phone">P:</abbr>
+    425.555.0100
+</address>
+
+<address>
+    <strong>Support:</strong> <a href="mailto:[email protected]">Support@example.com</a><br />
+    <strong>Marketing:</strong> <a href="mailto:[email protected]">Marketing@example.com</a>
+</address>

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AppWithP2PReference/Views/Home/Index.cshtml

@@ -0,0 +1,7 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div>
+    <p>Some test content.</p>
+</div>

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AppWithP2PReference/Views/Shared/_ValidationScriptsPartial.cshtml

@@ -0,0 +1,18 @@
+<environment include="Development">
+    <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
+    <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
+</environment>
+<environment exclude="Development">
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"
+            asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator"
+            crossorigin="anonymous"
+            integrity="sha384-Fnqn3nxp3506LP/7Y3j/25BlWeA3PXTyT1l78LjECcPaKCV12TsZP7yyMxOe/G/k">
+    </script>
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validation.unobtrusive/3.2.6/jquery.validate.unobtrusive.min.js"
+            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
+            crossorigin="anonymous"
+            integrity="sha384-JrXK+k53HACyavUKOsL+NkmSesD2P+73eDMrbTtTk0h4RmOF8hF8apPlkp26JlyH">
+    </script>
+</environment>

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AppWithP2PReference/Views/_ViewImports.cshtml

@@ -0,0 +1,3 @@
+@using AppWithP2PReference
+@using AppWithP2PReference.Models
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/AppWithP2PReference/Views/_ViewStart.cshtml

@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/ClassLibrary/Class1.cs

@@ -0,0 +1,7 @@
+namespace ClassLibrary
+{
+    public class Class1
+    {
+        // Just here so this assembly has some compilation inputs.
+    }
+}

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/ClassLibrary/ClassLibrary.csproj

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+  <PropertyGroup>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Copyright>© Microsoft</Copyright>
+    <Product>Razor Test</Product>
+    <Company>Microsoft</Company>
+    <Description>ClassLibrary Description</Description>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <StaticWebAssetSourcePath Include="public" />
+  </ItemGroup>
+</Project>

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/ClassLibrary/Components/App.razor

@@ -0,0 +1 @@
+<p>Hello from razor</p>

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/ClassLibrary/Components/App.razor.css

@@ -0,0 +1,3 @@
+p {
+  font-size: bold;
+}

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/ClassLibrary/Views/Shared/_Layout.cshtml

@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimpleMvc</title>
+
+    <environment include="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment exclude="Development">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SimpleMvc</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2017 - SimpleMvc</p>
+        </footer>
+    </div>
+
+    <environment include="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment exclude="Development">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/ClassLibrary/Views/_ViewImports.cshtml

@@ -0,0 +1,2 @@
+@using ClassLibrary
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

src/Assets/TestProjects/RazorAppWithP2PReferenceWithSwaPaths/ClassLibrary/public/js/project-transitive-dep.js

@@ -0,0 +1,3 @@
+(function () {
+  document.getElementById('project-transitive-dep').innerHTML = 'project-transitive-dep';
+})()

src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets

@@ -66,6 +66,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!-- Wire-up static web assets -->
   <PropertyGroup>
     <ResolveStaticWebAssetsInputsDependsOn>
+      _EnsureStaticWebAssetRootPath;
       $(ResolveStaticWebAssetsInputsDependsOn);
       _ResolveBlazorWasmOutputs;
     </ResolveStaticWebAssetsInputsDependsOn>
@@ -85,6 +86,10 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Target Name="_BlazorWasmNativeForBuild" DependsOnTargets="_GatherBlazorFilesToBuild;WasmBuildApp" Condition="'$(UsingBrowserRuntimeWorkload)' == 'true'" />
 
+  <Target Name="_EnsureStaticWebAssetRootPath">
+    <Error Message="The 'StaticWebAssetRootPath' property can't be changed for Blazor WebAssembly project" Condition="'$(StaticWebAssetRootPath)' != 'wwwroot'" />
+  </Target>
+
   <Target Name="_GatherBlazorFilesToBuild">
     <ItemGroup>
       <WasmAssembliesToBundle Condition="'%(WasmAssembliesToBundle.FileName)' == 'Microsoft.JSInterop.WebAssembly'" AOT_InternalForceToInterpret="true" />

src/StaticWebAssetsSdk/Sdk/Sdk.StaticWebAssets.StaticAssets.ProjectSystem.props

@@ -11,6 +11,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 -->
 <Project ToolsVersion="14.0">
 
+  <!-- Input and output configuration -->
+  <PropertyGroup>
+    <StaticWebAssetRootPath Condition="'$(StaticWebAssetRootPath)' == ''">wwwroot</StaticWebAssetRootPath>
+  </PropertyGroup>
+  <ItemGroup Condition="@(StaticWebAssetSourcePath->Count()) == 0">
+    <StaticWebAssetSourcePath Include="wwwroot" />
+  </ItemGroup>
+
   <!-- Properties for supporting static content -->
   <PropertyGroup>
 
@@ -22,15 +30,15 @@ Copyright (c) .NET Foundation. All rights reserved.
     <DefaultItemExcludes>$(DefaultItemExcludes);**\node_modules\**;node_modules\**</DefaultItemExcludes>
     <DefaultItemExcludes>$(DefaultItemExcludes);**\jspm_packages\**;jspm_packages\**</DefaultItemExcludes>
     <DefaultItemExcludes>$(DefaultItemExcludes);**\bower_components\**;bower_components\**</DefaultItemExcludes>
-    <DefaultWebContentItemExcludes>$(DefaultWebContentItemExcludes);wwwroot\**</DefaultWebContentItemExcludes>
+    <DefaultWebContentItemExcludes>$(DefaultWebContentItemExcludes);@(StaticWebAssetSourcePath->'%(Identity)\**')</DefaultWebContentItemExcludes>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true' ">
-    <!-- Publish everything under wwwroot, all JSON files, all config files and all Razor files -->
-    <Content Include="wwwroot\**" ExcludeFromSingleFile="true" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+    <!-- Publish everything under @(StaticWebAssetSourcePath), all JSON files, all config files and all Razor files -->
+    <Content Include="%(StaticWebAssetSourcePath->Identity)\**" ExcludeFromSingleFile="true" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
 
     <!-- Specifically support the ~/.well-known directory as per IETF RFC5785 -->
-    <Content Include="wwwroot\.well-known\**" ExcludeFromSingleFile="true" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes)" />
+    <Content Include="%(StaticWebAssetSourcePath->Identity)\.well-known\**" ExcludeFromSingleFile="true" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes)" />
 
     <Content Include="**\*.config" ExcludeFromSingleFile="true" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" Condition="'$(ExcludeConfigFilesFromBuildOutput)'!='true'" />
     <Content Include="**\*.json" ExcludeFromSingleFile="true" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" Condition="'$(ExcludeConfigFilesFromBuildOutput)'!='true'" />
@@ -43,9 +51,9 @@ Copyright (c) .NET Foundation. All rights reserved.
     <Content Update="$(AppDesignerFolder)\**" CopyToPublishDirectory="Never" Condition="'$(AppDesignerFolder)' != ''"/>
 
     <!-- Remove Content items from other item types (in a way that CPS understands) -->
-    <None Remove="wwwroot\**;**\*.json;**\*.config" />
-    <Compile Remove="wwwroot\**" />
-    <EmbeddedResource Remove="wwwroot\**" />
+    <None Remove="%(StaticWebAssetSourcePath->Identity)\**;**\*.json;**\*.config" />
+    <Compile Remove="%(StaticWebAssetSourcePath->Identity)\**" />
+    <EmbeddedResource Remove="%(StaticWebAssetSourcePath->Identity)\**" />
 
     <!-- Keep track of the default content items for later to distinguish them from newly generated content items -->
     <!-- It's important to keep this here so that it works well with the Web SDK -->

src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets

@@ -76,7 +76,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       <_JSFileModuleCandidates Include="@(_JSFileModuleNoneCandidates)" />
     </ItemGroup>
 
-    <!-- This runs after we've discovered the original set of files, we already found the assets in the wwwroot, and here we just need
+    <!-- This runs after we've discovered the original set of files, we already found the assets in the @(StaticWebAssetSourcePath), and here we just need
          to identify them and correctly clasify them. Modules from other projects or packages will already be correctly tagged when we
          retrieve them.
     -->
@@ -95,7 +95,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- **/*.razor.js -->
     <DiscoverStaticWebAssets Candidates="@(_JSFileModuleCandidates)"
       SourceId="$(PackageId)"
-      Pattern="**/*.razor.js"
+      Patterns="**/*.razor.js"
       ContentRoot="$(MSBuildProjectDirectory)"
       BasePath="$(StaticWebAssetBasePath)"
       AssetMergeSource="$(StaticWebAssetMergeTarget)"
@@ -106,7 +106,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- **/*.cshtml.js -->
     <DiscoverStaticWebAssets Candidates="@(_JSFileModuleCandidates)"
       SourceId="$(PackageId)"
-      Pattern="**/*.cshtml.js"
+      Patterns="**/*.cshtml.js"
       ContentRoot="$(MSBuildProjectDirectory)"
       BasePath="$(StaticWebAssetBasePath)"
       AssetMergeSource="$(StaticWebAssetMergeTarget)"