Fix local development scenarios

Author: MackinnonBuck

AspNetCore.sln

@@ -1816,6 +1816,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.OpenAp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.App.SourceGenerators", "src\Framework\AspNetCoreAnalyzers\src\SourceGenerators\Microsoft.AspNetCore.App.SourceGenerators.csproj", "{C3928C15-1836-46DB-A09D-9EFBCCA33E08}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{2B858B82-5F0B-4A24-B3C0-5E99149F70D6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Assets.Pack", "src\Assets\Pack\Microsoft.AspNetCore.Assets.Pack.csproj", "{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -10977,6 +10981,22 @@ Global
 		{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|x64.Build.0 = Release|Any CPU
 		{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|x86.ActiveCfg = Release|Any CPU
 		{C3928C15-1836-46DB-A09D-9EFBCCA33E08}.Release|x86.Build.0 = Release|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|arm64.Build.0 = Debug|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|x64.Build.0 = Debug|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Debug|x86.Build.0 = Debug|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|arm64.Build.0 = Release|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|x64.ActiveCfg = Release|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|x64.Build.0 = Release|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|x86.ActiveCfg = Release|Any CPU
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -11874,6 +11894,8 @@ Global
 		{B32FF7A7-9CB3-4DCD-AE97-3B2594DB9DAC} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B}
 		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7} = {B32FF7A7-9CB3-4DCD-AE97-3B2594DB9DAC}
 		{C3928C15-1836-46DB-A09D-9EFBCCA33E08} = {B5D98AEB-9409-4280-8225-9C1EC6A791B2}
+		{2B858B82-5F0B-4A24-B3C0-5E99149F70D6} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
+		{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62} = {2B858B82-5F0B-4A24-B3C0-5E99149F70D6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

src/Assets/Pack/Microsoft.AspNetCore.Assets.Pack.proj renamed to src/Assets/Pack/Microsoft.AspNetCore.Assets.Pack.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web" DefaultTargets="Pack">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -9,6 +9,7 @@
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
+    <ImplicitUsings>disable</ImplicitUsings>
 
     <!-- The package doesn't produce any lib or ref assemblies -->
     <NoWarn>$(NoWarn);NU5128</NoWarn>
@@ -19,6 +20,7 @@
     <StaticWebAssetsDisableProjectBuildPropsFileGeneration>true</StaticWebAssetsDisableProjectBuildPropsFileGeneration>
     <StaticWebAssetsDisableProjectBuildMultiTargetingPropsFileGeneration>true</StaticWebAssetsDisableProjectBuildMultiTargetingPropsFileGeneration>
     <StaticWebAssetsDisableProjectBuildTransitivePropsFileGeneration>true</StaticWebAssetsDisableProjectBuildTransitivePropsFileGeneration>
+    <StaticWebAssetsGetBuildAssetsTargets>_GetFrameworkBuildAssets</StaticWebAssetsGetBuildAssetsTargets>
   </PropertyGroup>
 
   <ItemGroup>
@@ -55,6 +57,36 @@
 
   </Target>
 
+  <Target Name="_GetFrameworkBuildAssets" Returns="@(ReferenceAsset)">
+
+    <ItemGroup>
+      <_ReferenceAssetCandidates Include="@(_BlazorJSFile)" />
+      <_ReferenceAssetCandidates>
+        <RelativePath>$(StaticWebAssetBasePath)/%(FileName)%(Extension)</RelativePath>
+        <ContentRoot>$([System.IO.Path]::GetFullPath($([System.IO.Path]::GetDirectoryName('%(Identity)'))))</ContentRoot>
+      </_ReferenceAssetCandidates>
+    </ItemGroup>
+
+    <DefineStaticWebAssets
+      Condition="'@(_ReferenceAssetCandidates->Count())' != '0'"
+      CandidateAssets="@(_ReferenceAssetCandidates)"
+      SourceId="$(PackageId)"
+      SourceType="Project"
+      AssetKind="All"
+      FingerprintCandidates="true"
+      BasePath="/"
+    >
+      <Output TaskParameter="Assets" ItemName="ReferenceAsset" />
+    </DefineStaticWebAssets>
+
+    <ItemGroup>
+      <ReferenceAsset>
+        <ResultType>StaticWebAsset</ResultType>
+      </ReferenceAsset>
+    </ItemGroup>
+
+  </Target>
+
   <Target Name="_GenerateFrameworkPackItems" BeforeTargets="GenerateStaticWebAssetsPackFiles">
     <ItemGroup>
       <_AssetCandidates Include="@(_BlazorJSFile)" />
@@ -110,7 +142,4 @@
 
   </Target>
 
-  <Target Name="CreateManifestResourceNames" />
-  <Target Name="CoreCompile" />
-
 </Project>

src/Components/Components.slnf

@@ -4,6 +4,7 @@
     "projects": [
       "src\\Analyzers\\Microsoft.AspNetCore.Analyzer.Testing\\src\\Microsoft.AspNetCore.Analyzer.Testing.csproj",
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
+      "src\\Assets\\Pack\\Microsoft.AspNetCore.Assets.Pack.csproj",
       "src\\Components\\Analyzers\\src\\Microsoft.AspNetCore.Components.Analyzers.csproj",
       "src\\Components\\Analyzers\\test\\Microsoft.AspNetCore.Components.Analyzers.Tests.csproj",
       "src\\Components\\Authorization\\src\\Microsoft.AspNetCore.Components.Authorization.csproj",
@@ -156,4 +157,4 @@
       "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
     ]
   }
-}
+}

src/Components/Directory.Build.targets

@@ -1,21 +1,3 @@
 <Project>
-  <PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'">
-    <BlazorWebAssemblyJSPath
-        Condition=" '$(Configuration)' == 'Debug' ">$(RepoRoot)src\Components\Web.JS\dist\Debug\blazor.webassembly.js</BlazorWebAssemblyJSPath>
-    <BlazorWebAssemblyJSPath
-        Condition=" '$(Configuration)' != 'Debug' ">$(RepoRoot)src\Components\Web.JS\dist\Release\blazor.webassembly.js</BlazorWebAssemblyJSPath>
-    <BlazorWebAssemblyJSMapPath>$(BlazorWebAssemblyJSPath).map</BlazorWebAssemblyJSMapPath>
-
-    <_BlazorDevServerPath>$(ArtifactsDir)bin/Microsoft.AspNetCore.Components.WebAssembly.DevServer/$(Configuration)/$(DefaultNetCoreTargetFramework)/blazor-devserver.dll</_BlazorDevServerPath>
-    <RunCommand>dotnet</RunCommand>
-    <_RunExtraArguments Condition="'$(WasmEnableThreads)' == 'true'">--apply-cop-headers</_RunExtraArguments>
-    <RunArguments>exec &quot;$(_BlazorDevServerPath)&quot; --applicationpath &quot;$(TargetPath)&quot; $(_RunExtraArguments) $(AdditionalRunArguments)</RunArguments>
-  </PropertyGroup>
-
-  <Target Name="_CheckBlazorWebAssemblyJSPath" AfterTargets="ResolveProjectReferences"
-    Condition=" '$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' AND !EXISTS('$(BlazorWebAssemblyJSPath)') ">
-    <Error Text="'$(BlazorWebAssemblyJSPath)' does not exist. Enable NodeJS to build this project." />
-  </Target>
-
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
 </Project>

src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSource.cs

@@ -10,9 +10,6 @@
 using Microsoft.AspNetCore.Components.Endpoints.Infrastructure;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.AspNetCore.Routing.Patterns;
-using Microsoft.AspNetCore.StaticFiles;
-using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Primitives;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
@@ -180,7 +177,6 @@ private void UpdateEndpoints()
     private void AddBlazorWebEndpoints(List<Endpoint> endpoints)
     {
         List<EndpointBuilder> blazorWebEndpoints = [
-            ..GetBlazorWebJsEndpoint(_endpointRouteBuilder),
             OpaqueRedirection.GetBlazorOpaqueRedirectionEndpoint()];
 
         foreach (var endpoint in blazorWebEndpoints)
@@ -199,56 +195,6 @@ private void AddBlazorWebEndpoints(List<Endpoint> endpoints)
         }
     }
 
-    private static IEnumerable<EndpointBuilder> GetBlazorWebJsEndpoint(IEndpointRouteBuilder endpoints)
-    {
-        var app = endpoints.CreateApplicationBuilder();
-
-        var options = new StaticFileOptions
-        {
-            FileProvider = new ManifestEmbeddedFileProvider(typeof(RazorComponentsEndpointRouteBuilderExtensions).Assembly),
-            OnPrepareResponse = CacheHeaderSettings.SetCacheHeaders
-        };
-
-        app.Use(next => context =>
-        {
-            // Set endpoint to null so the static files middleware will handle the request.
-            context.SetEndpoint(null);
-
-            return next(context);
-        });
-
-        app.UseStaticFiles(options);
-
-        var requestDelegate = app.Build();
-
-        var blazorWebJsBuilder = new RouteEndpointBuilder(
-            requestDelegate,
-            RoutePatternFactory.Parse("/_framework/blazor.web.js"),
-            int.MinValue)
-        {
-            DisplayName = "Blazor web static files"
-        };
-
-        var allowedHttpMethods = new HttpMethodMetadata([HttpMethods.Get, HttpMethods.Head]);
-        blazorWebJsBuilder.Metadata.Add(allowedHttpMethods);
-
-#if !DEBUG
-        return [blazorWebJsBuilder];
-#else
-        // We only need to serve the sourcemap when working on the framework, not in the distributed packages
-        var blazorWebJsDebugBuilder = new RouteEndpointBuilder(
-            requestDelegate,
-            RoutePatternFactory.Parse("/_framework/blazor.web.js.map"),
-            int.MinValue)
-        {
-            DisplayName = "Blazor web static files sourcemap"
-        };
-        blazorWebJsDebugBuilder.Metadata.Add(allowedHttpMethods);
-
-        return [blazorWebJsBuilder, blazorWebJsDebugBuilder];
-#endif
-    }
-
     public void OnHotReloadClearCache(Type[]? types)
     {
         lock (_lock)

src/Components/Endpoints/src/Directory.Build.targets

@@ -1,6 +1,3 @@
 <Project>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
-  <!-- Workaround target import for project references to Microsoft.Extensions.FileProviders.Embedded -->
-  <Import
-    Project="$(RepoRoot)src\FileProviders\Embedded\src\build\netstandard2.0\Microsoft.Extensions.FileProviders.Embedded.targets" />
 </Project>

src/Components/Endpoints/src/Microsoft.AspNetCore.Components.Endpoints.csproj

@@ -8,18 +8,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS0436</NoWarn>
     <IsPackable>false</IsPackable>
-    <EmbeddedFilesManifestFileName>Microsoft.Extensions.FileProviders.Embedded.Manifest.xml</EmbeddedFilesManifestFileName>
     <Nullable>enable</Nullable>
     <DefineConstants>$(DefineConstants);COMPONENTS</DefineConstants>
   </PropertyGroup>
 
-  <!-- This workaround is required when referencing FileProviders.Embedded as a project -->
-  <PropertyGroup>
-    <_FileProviderTaskAssembly>$(ArtifactsDir)bin\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task\$(Configuration)\netstandard2.0\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.dll</_FileProviderTaskAssembly>
-  </PropertyGroup>
-
-  <UsingTask AssemblyFile="$(_FileProviderTaskAssembly)" TaskName="Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.GenerateEmbeddedResourcesManifest" />
-
   <ItemGroup>
     <EmbeddedResource Update="FormMapping\FormDataResources.resx" ExcludeFromManifest="true" />
     <EmbeddedResource Update="Resources.resx" ExcludeFromManifest="true" />
@@ -57,7 +49,6 @@
     <Reference Include="Microsoft.AspNetCore.Routing" />
     <Reference Include="Microsoft.AspNetCore.StaticFiles" />
     <Reference Include="Microsoft.AspNetCore.StaticAssets" />
-    <Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
   </ItemGroup>
 
   <ItemGroup>

src/Components/Samples/BlazorUnitedApp/App.razor

@@ -15,6 +15,6 @@
 </head>
 <body>
     <Routes />
-    <script src="_framework/blazor.web.js"></script>
+    <script src="@Assets["_framework/blazor.web.js"]"></script>
 </body>
 </html>

src/Components/Server/src/Builder/ComponentEndpointConventionBuilder.cs

@@ -11,18 +11,15 @@ public sealed class ComponentEndpointConventionBuilder : IHubEndpointConventionB
     private readonly IEndpointConventionBuilder _hubEndpoint;
     private readonly IEndpointConventionBuilder _disconnectEndpoint;
     private readonly IEndpointConventionBuilder _jsInitializersEndpoint;
-    private readonly IEndpointConventionBuilder _blazorEndpoint;
 
     internal ComponentEndpointConventionBuilder(
         IEndpointConventionBuilder hubEndpoint,
         IEndpointConventionBuilder disconnectEndpoint,
-        IEndpointConventionBuilder jsInitializersEndpoint,
-        IEndpointConventionBuilder blazorEndpoint)
+        IEndpointConventionBuilder jsInitializersEndpoint)
     {
         _hubEndpoint = hubEndpoint;
         _disconnectEndpoint = disconnectEndpoint;
         _jsInitializersEndpoint = jsInitializersEndpoint;
-        _blazorEndpoint = blazorEndpoint;
     }
 
     /// <summary>
@@ -34,7 +31,6 @@ public void Add(Action<EndpointBuilder> convention)
         _hubEndpoint.Add(convention);
         _disconnectEndpoint.Add(convention);
         _jsInitializersEndpoint.Add(convention);
-        _blazorEndpoint.Add(convention);
     }
 
     /// <inheritdoc/>
@@ -43,6 +39,5 @@ public void Finally(Action<EndpointBuilder> finalConvention)
         _hubEndpoint.Finally(finalConvention);
         _disconnectEndpoint.Finally(finalConvention);
         _jsInitializersEndpoint.Finally(finalConvention);
-        _blazorEndpoint.Finally(finalConvention);
     }
 }

src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs

@@ -2,12 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Components.Server;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Connections;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.AspNetCore.StaticFiles;
-using Microsoft.Extensions.FileProviders;
 
 namespace Microsoft.AspNetCore.Builder;
 
@@ -88,41 +85,6 @@ public static ComponentEndpointConventionBuilder MapBlazorHub(
             endpoints.CreateApplicationBuilder().UseMiddleware<CircuitJavaScriptInitializationMiddleware>().Build())
             .WithDisplayName("Blazor initializers");
 
-        var blazorEndpoint = GetBlazorEndpoint(endpoints);
-
-        return new ComponentEndpointConventionBuilder(hubEndpoint, disconnectEndpoint, jsInitializersEndpoint, blazorEndpoint);
-    }
-
-    private static IEndpointConventionBuilder GetBlazorEndpoint(IEndpointRouteBuilder endpoints)
-    {
-        var options = new StaticFileOptions
-        {
-            FileProvider = new ManifestEmbeddedFileProvider(typeof(ComponentEndpointRouteBuilderExtensions).Assembly),
-            OnPrepareResponse = CacheHeaderSettings.SetCacheHeaders
-        };
-
-        var app = endpoints.CreateApplicationBuilder();
-        app.Use(next => context =>
-        {
-            // Set endpoint to null so the static files middleware will handle the request.
-            context.SetEndpoint(null);
-
-            return next(context);
-        });
-        app.UseStaticFiles(options);
-
-        var blazorEndpoint = endpoints.Map("/_framework/blazor.server.js", app.Build())
-            .WithDisplayName("Blazor static files");
-
-        blazorEndpoint.Add((builder) => ((RouteEndpointBuilder)builder).Order = int.MinValue);
-
-#if DEBUG
-        // We only need to serve the sourcemap when working on the framework, not in the distributed packages
-        endpoints.Map("/_framework/blazor.server.js.map", app.Build())
-            .WithDisplayName("Blazor static files sourcemap")
-            .Add((builder) => ((RouteEndpointBuilder)builder).Order = int.MinValue);
-#endif
-
-        return blazorEndpoint;
+        return new ComponentEndpointConventionBuilder(hubEndpoint, disconnectEndpoint, jsInitializersEndpoint);
     }
 }