Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-64b0aa88-723e-4fdd-9c5d-555f720457d0

Author: tmat

src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj

@@ -25,4 +25,10 @@
   </ItemGroup>
 
   <Import Project="..\Web.Middleware\Microsoft.DotNet.HotReload.Web.Middleware.projitems" Label="Shared" />
+
+  <ItemGroup>
+    <EmbeddedResource Update="@(EmbeddedResource)">
+      <LogicalName>%(FileName)%(Extension)</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>

src/BuiltInTools/Web.Middleware/BrowserScriptMiddleware.cs

@@ -48,7 +48,7 @@ public async Task InvokeAsync(HttpContext context)
         // for backwards compat only
         internal static ReadOnlyMemory<byte> GetBlazorHotReloadJS()
         {
-            var jsFileName = "Microsoft.AspNetCore.Watch.BrowserRefresh.BlazorHotReload.js";
+            var jsFileName = "BlazorHotReload.js";
             using var stream = new MemoryStream();
             var manifestStream = typeof(BrowserScriptMiddleware).Assembly.GetManifestResourceStream(jsFileName)!;
             manifestStream.CopyTo(stream);
@@ -66,7 +66,7 @@ internal static ReadOnlyMemory<byte> GetBrowserRefreshJS()
 
         internal static ReadOnlyMemory<byte> GetWebSocketClientJavaScript(string hostString, string serverKey)
         {
-            var jsFileName = "Microsoft.AspNetCore.Watch.BrowserRefresh.WebSocketScriptInjection.js";
+            var jsFileName = "WebSocketScriptInjection.js";
             using var reader = new StreamReader(typeof(BrowserScriptMiddleware).Assembly.GetManifestResourceStream(jsFileName)!);
             var script = reader.ReadToEnd()
                 .Replace("{{hostString}}", hostString)

src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj

@@ -38,4 +38,19 @@
   <ItemGroup>
     <Using Remove="@(Using)" />
   </ItemGroup>
+
+  <PropertyGroup>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_AddJSFilesToSourcePackage</TargetsForTfmSpecificContentInPackage>
+  </PropertyGroup>
+
+  <!--
+    Add .js files as embedded resources in the source package.
+  -->
+  <Target Name="_AddJSFilesToSourcePackage">
+    <ItemGroup>
+      <!-- Must be in 'cs' directory since NuGet filters the files based on consuming project language -->
+      <_File Include="$(MSBuildProjectDirectory)\**\*.js" TargetDir="contentFiles/cs/$(TargetFramework)" BuildAction="EmbeddedResource" />
+      <TfmSpecificPackageFile Include="@(_File)" PackagePath="%(_File.TargetDir)/%(_File.RecursiveDir)%(_File.FileName)%(_File.Extension)"/>
+    </ItemGroup>
+  </Target>
 </Project>