diff --git a/NuGet.config b/NuGet.config
index f1350b49d9e2..b95abc392e57 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -8,11 +8,6 @@
     <add key="darc-pub-dotnet-aspire-2c38f6c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspire-2c38f6c8-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspire -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-e77011b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-e77011b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-5/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-e77011b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-e77011b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-e77011b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -40,11 +35,6 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-e77011b-1" value="true" />
-    <add key="darc-int-dotnet-runtime-e77011b-2" value="true" />
-    <add key="darc-int-dotnet-runtime-e77011b-3" value="true" />
-    <add key="darc-int-dotnet-runtime-e77011b-5" value="true" />
-    <add key="darc-int-dotnet-runtime-e77011b" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index bca2493675f6..b20d7e028d59 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -15,46 +15,46 @@
       <Sha>bdb2faf6e645c173495d7b68606ce0b623bfa3ef</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.NET.HostModel" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Hashing" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.IO.Hashing" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
       <SourceBuild RepoName="runtime" ManagedOnly="false" />
     </Dependency>
     <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
@@ -63,14 +63,14 @@
       <Uri>https://github.com/dotnet/core-setup</Uri>
       <Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.24474.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.24515.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>4ea46baeaf74d5a99cb93593362b6d8263b10550</Sha>
+      <Sha>e0a38f7136d6ddc035b3d0d81d8a61fd903c06fd</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="10.0.0-alpha.1.24474.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="10.0.0-alpha.1.24515.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>4ea46baeaf74d5a99cb93593362b6d8263b10550</Sha>
+      <Sha>e0a38f7136d6ddc035b3d0d81d8a61fd903c06fd</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Build" Version="17.13.0-preview-24521-01">
@@ -234,25 +234,25 @@
       <Sha>bc9161306b23641b0364b8f93d546da4d48da1eb</Sha>
       <SourceBuild RepoName="vstest" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.CodeDom" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.CodeDom" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.Formats.Asn1" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.Formats.Asn1" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.ProtectedData" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.Security.Cryptography.ProtectedData" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encoding.CodePages" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.Text.Encoding.CodePages" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
     <!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.
          See https://github.com/dotnet/sdk/issues/42920. -->
@@ -509,81 +509,81 @@
       <SourceBuild RepoName="symreader" ManagedOnly="true" />
     </Dependency>
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
-    <Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
-    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
-    <Dependency Name="System.ServiceProcess.ServiceController" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.ServiceProcess.ServiceController" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.Text.Json" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.24522.8">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>0cf40ce4f575cfdefcbf0d84b2303d75a9527ecd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.Composition.AttributedModel" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.Composition.AttributedModel" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.Composition.Convention" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.Composition.Convention" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.Composition.Hosting" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.Composition.Hosting" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.Composition.Runtime" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.Composition.Runtime" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.Composition.TypedParts" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.Composition.TypedParts" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-alpha.1.24507.22">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-alpha.1.24523.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>43295bb5378453d2ec4d9272cb44c6f50b4faa1f</Sha>
+      <Sha>edaa25e6942f3e8d9e2f078d99f34ed015658fbe</Sha>
     </Dependency>
     <Dependency Name="System.Security.Permissions" Version="9.0.0-rc.1.24431.7" Pinned="True">
       <Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 18c1ab7210bb..e6250450691b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -126,43 +126,43 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.24507.22</MicrosoftNETCoreAppRefPackageVersion>
-    <VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24507.22</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24507.22</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-alpha.1.24507.22</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETHostModelVersion>10.0.0-alpha.1.24507.22</MicrosoftNETHostModelVersion>
-    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0-alpha.1.24507.22</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-alpha.1.24507.22</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>10.0.0-alpha.1.24507.22</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingVersion>10.0.0-alpha.1.24507.22</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.24507.22</MicrosoftNETILLinkTasksPackageVersion>
-    <SystemServiceProcessServiceControllerVersion>10.0.0-alpha.1.24507.22</SystemServiceProcessServiceControllerVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.24523.5</MicrosoftNETCoreAppRefPackageVersion>
+    <VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24523.5</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24523.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-alpha.1.24523.5</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftNETHostModelVersion>10.0.0-alpha.1.24523.5</MicrosoftNETHostModelVersion>
+    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0-alpha.1.24523.5</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-alpha.1.24523.5</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>10.0.0-alpha.1.24523.5</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingVersion>10.0.0-alpha.1.24523.5</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.24523.5</MicrosoftNETILLinkTasksPackageVersion>
+    <SystemServiceProcessServiceControllerVersion>10.0.0-alpha.1.24523.5</SystemServiceProcessServiceControllerVersion>
     <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftNETCorePlatformsPackageVersion>10.0.0-alpha.1.24507.22</MicrosoftNETCorePlatformsPackageVersion>
-    <VSRedistCommonNetCoreTargetingPackx64100PackageVersion>10.0.0-alpha.1.24507.22</VSRedistCommonNetCoreTargetingPackx64100PackageVersion>
-    <MicrosoftNETCoreAppHostwinx64PackageVersion>10.0.0-alpha.1.24507.22</MicrosoftNETCoreAppHostwinx64PackageVersion>
-    <MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-alpha.1.24507.22</MicrosoftBclAsyncInterfacesPackageVersion>
-    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0-alpha.1.24507.22</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
-    <MicrosoftWin32SystemEventsPackageVersion>10.0.0-alpha.1.24507.22</MicrosoftWin32SystemEventsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>10.0.0-alpha.1.24523.5</MicrosoftNETCorePlatformsPackageVersion>
+    <VSRedistCommonNetCoreTargetingPackx64100PackageVersion>10.0.0-alpha.1.24523.5</VSRedistCommonNetCoreTargetingPackx64100PackageVersion>
+    <MicrosoftNETCoreAppHostwinx64PackageVersion>10.0.0-alpha.1.24523.5</MicrosoftNETCoreAppHostwinx64PackageVersion>
+    <MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-alpha.1.24523.5</MicrosoftBclAsyncInterfacesPackageVersion>
+    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0-alpha.1.24523.5</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
+    <MicrosoftWin32SystemEventsPackageVersion>10.0.0-alpha.1.24523.5</MicrosoftWin32SystemEventsPackageVersion>
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
-    <SystemCodeDomPackageVersion>10.0.0-alpha.1.24507.22</SystemCodeDomPackageVersion>
-    <SystemCompositionAttributedModelPackageVersion>10.0.0-alpha.1.24507.22</SystemCompositionAttributedModelPackageVersion>
-    <SystemCompositionConventionPackageVersion>10.0.0-alpha.1.24507.22</SystemCompositionConventionPackageVersion>
-    <SystemCompositionHostingPackageVersion>10.0.0-alpha.1.24507.22</SystemCompositionHostingPackageVersion>
-    <SystemCompositionRuntimePackageVersion>10.0.0-alpha.1.24507.22</SystemCompositionRuntimePackageVersion>
-    <SystemCompositionTypedPartsPackageVersion>10.0.0-alpha.1.24507.22</SystemCompositionTypedPartsPackageVersion>
-    <SystemConfigurationConfigurationManagerPackageVersion>10.0.0-alpha.1.24507.22</SystemConfigurationConfigurationManagerPackageVersion>
+    <SystemCodeDomPackageVersion>10.0.0-alpha.1.24523.5</SystemCodeDomPackageVersion>
+    <SystemCompositionAttributedModelPackageVersion>10.0.0-alpha.1.24523.5</SystemCompositionAttributedModelPackageVersion>
+    <SystemCompositionConventionPackageVersion>10.0.0-alpha.1.24523.5</SystemCompositionConventionPackageVersion>
+    <SystemCompositionHostingPackageVersion>10.0.0-alpha.1.24523.5</SystemCompositionHostingPackageVersion>
+    <SystemCompositionRuntimePackageVersion>10.0.0-alpha.1.24523.5</SystemCompositionRuntimePackageVersion>
+    <SystemCompositionTypedPartsPackageVersion>10.0.0-alpha.1.24523.5</SystemCompositionTypedPartsPackageVersion>
+    <SystemConfigurationConfigurationManagerPackageVersion>10.0.0-alpha.1.24523.5</SystemConfigurationConfigurationManagerPackageVersion>
     <SystemReflectionMetadataLoadContextVersion>9.0.0-rc.1.24431.7</SystemReflectionMetadataLoadContextVersion>
     <SystemResourcesExtensionsPackageVersion>9.0.0-rc.1.24431.7</SystemResourcesExtensionsPackageVersion>
-    <SystemSecurityCryptographyPkcsPackageVersion>10.0.0-alpha.1.24507.22</SystemSecurityCryptographyPkcsPackageVersion>
-    <SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-alpha.1.24507.22</SystemSecurityCryptographyProtectedDataPackageVersion>
-    <SystemSecurityCryptographyXmlPackageVersion>10.0.0-alpha.1.24507.22</SystemSecurityCryptographyXmlPackageVersion>
+    <SystemSecurityCryptographyPkcsPackageVersion>10.0.0-alpha.1.24523.5</SystemSecurityCryptographyPkcsPackageVersion>
+    <SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-alpha.1.24523.5</SystemSecurityCryptographyProtectedDataPackageVersion>
+    <SystemSecurityCryptographyXmlPackageVersion>10.0.0-alpha.1.24523.5</SystemSecurityCryptographyXmlPackageVersion>
     <SystemSecurityPermissionsPackageVersion>9.0.0-rc.1.24431.7</SystemSecurityPermissionsPackageVersion>
-    <SystemTextEncodingCodePagesPackageVersion>10.0.0-alpha.1.24507.22</SystemTextEncodingCodePagesPackageVersion>
-    <SystemTextJsonPackageVersion>10.0.0-alpha.1.24507.22</SystemTextJsonPackageVersion>
+    <SystemTextEncodingCodePagesPackageVersion>10.0.0-alpha.1.24523.5</SystemTextEncodingCodePagesPackageVersion>
+    <SystemTextJsonPackageVersion>10.0.0-alpha.1.24523.5</SystemTextJsonPackageVersion>
     <SystemWindowsExtensionsPackageVersion>9.0.0-rc.1.24431.7</SystemWindowsExtensionsPackageVersion>
-    <SystemIOHashingPackageVersion>10.0.0-alpha.1.24507.22</SystemIOHashingPackageVersion>
-    <SystemFormatsAsn1Version>10.0.0-alpha.1.24507.22</SystemFormatsAsn1Version>
+    <SystemIOHashingPackageVersion>10.0.0-alpha.1.24523.5</SystemIOHashingPackageVersion>
+    <SystemFormatsAsn1Version>10.0.0-alpha.1.24523.5</SystemFormatsAsn1Version>
     <!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
          Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
     <MicrosoftBclAsyncInterfacesToolsetPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesToolsetPackageVersion>
@@ -361,7 +361,7 @@
     <XamarinMacOSWorkloadManifestVersion>14.2.9714-net9-p6</XamarinMacOSWorkloadManifestVersion>
     <XamarinTvOSWorkloadManifestVersion>17.2.9714-net9-p6</XamarinTvOSWorkloadManifestVersion>
     <!-- Workloads from dotnet/emsdk -->
-    <MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>10.0.0-alpha.1.24474.1</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>
+    <MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>10.0.0-alpha.1.24515.3</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>
     <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
     <!-- emsdk workload prerelease version band must match the emsdk feature band -->
     <EmscriptenWorkloadFeatureBand>10.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml
index fb7995742633..d98185a1a87c 100644
--- a/eng/pipelines/templates/jobs/vmr-build.yml
+++ b/eng/pipelines/templates/jobs/vmr-build.yml
@@ -48,7 +48,8 @@ parameters:
 - name: sign
   displayName: True when build output should be signed
   type: boolean
-  default: true
+  # Temporarily set to false to unblock build: https://github.com/dotnet/runtime/issues/109178
+  default: false
 
 # Overrides the rid that is produced by the build.
 - name: targetRid
diff --git a/src/SourceBuild/patches/runtime/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch b/src/SourceBuild/patches/runtime/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
deleted file mode 100644
index f3e0e10368c8..000000000000
--- a/src/SourceBuild/patches/runtime/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jo Shields <joshield@microsoft.com>
-Date: Mon, 23 Sep 2024 10:11:14 -0400
-Subject: [PATCH] Rename SourceBuildUseMonoRuntime property, which is not SB
- specific
-
-This is a coordinated cross-repo change, and might break the build until
-all four PRs are merged. The other three are:
-
-Backport: https://github.com/dotnet/source-build/issues/4165
----
- eng/DotNetBuild.props | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
-index ce13d6ca5b0..316eea2522b 100644
---- a/eng/DotNetBuild.props
-+++ b/eng/DotNetBuild.props
-@@ -53,7 +53,7 @@
-       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)verbosity $(LogVerbosity)</InnerBuildArgs>
-       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>
-       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>
--      <InnerBuildArgs Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)usemonoruntime</InnerBuildArgs>
-+      <InnerBuildArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)usemonoruntime</InnerBuildArgs>
-       <!-- TODO: This parameter is only available on the Unix script. Intentional? -->
-       <InnerBuildArgs Condition="'$(OS)' != 'Windows_NT'">$(InnerBuildArgs) --outputrid $(TargetRid)</InnerBuildArgs>
-       <!-- PackageOS and ToolsOS control the rids of prebuilts consumed by the build.
diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateGlobalUsings_BlazorWasm.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateGlobalUsings_BlazorWasm.cs
index 6eafd362ee82..639d5dde1b8b 100644
--- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateGlobalUsings_BlazorWasm.cs
+++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateGlobalUsings_BlazorWasm.cs
@@ -7,7 +7,7 @@ public class GivenThatWeWantToGenerateGlobalUsings_BlazorWasm : SdkTest
     {
         public GivenThatWeWantToGenerateGlobalUsings_BlazorWasm(ITestOutputHelper log) : base(log) { }
 
-        [RequiresMSBuildVersionFact("17.0.0.32901")]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void It_generates_blazorwasm_usings_and_builds_successfully()
         {
             var tfm = ToolsetInfo.CurrentTargetFramework;
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorMultitargetIntegrationTest.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorMultitargetIntegrationTest.cs
index df801cb22290..9b3940520cc7 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorMultitargetIntegrationTest.cs
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorMultitargetIntegrationTest.cs
@@ -9,7 +9,7 @@ public class BlazorMultitargetIntegrationTest(ITestOutputHelper log)
         : IsolatedNuGetPackageFolderAspNetSdkBaselineTest(log, nameof(BlazorMultitargetIntegrationTest))
     {
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void MultiTargetApp_LoadsTheCorrectSdkBasedOnTfm()
         {
             // Arrange
@@ -29,7 +29,7 @@ public void MultiTargetApp_LoadsTheCorrectSdkBasedOnTfm()
             browserDependencies.File("captured-references.txt").Should().NotContain("Microsoft.AspNetCore.Components.Server.dll");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void ReferencedMultiTargetApp_LoadsTheCorrectSdkBasedOnTfm()
         {
             // Arrange
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmStaticWebAssetsIntegrationTest.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmStaticWebAssetsIntegrationTest.cs
index b9113daca9ae..a8e144d124ea 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmStaticWebAssetsIntegrationTest.cs
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmStaticWebAssetsIntegrationTest.cs
@@ -7,7 +7,7 @@ namespace Microsoft.NET.Sdk.BlazorWebAssembly.Tests
 {
     public class BlazorWasmStaticWebAssetsIntegrationTest(ITestOutputHelper log) : BlazorWasmBaselineTests(log, GenerateBaselines)
     {
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void StaticWebAssets_BuildMinimal_Works()
         {
             // Arrange
@@ -49,7 +49,7 @@ public void StaticWebAssets_BuildMinimal_Works()
                 intermediateOutputPath);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void StaticWebAssets_PublishMinimal_Works()
         {
             // Arrange
@@ -86,7 +86,7 @@ public void StaticWebAssets_PublishMinimal_Works()
                 intermediateOutputPath);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void StaticWebAssets_Build_Hosted_Works()
         {
             // Arrange
@@ -126,7 +126,7 @@ public void StaticWebAssets_Build_Hosted_Works()
                 intermediateOutputPath);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void StaticWebAssets_Publish_Hosted_Works()
         {
             // Arrange
@@ -166,7 +166,7 @@ public void StaticWebAssets_Publish_Hosted_Works()
                 intermediateOutputPath);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets()
         {
             // Arrange
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json
index 0262d7e168a0..e57b30222a35 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json
@@ -891,14 +891,10 @@
   "${OutputPath}\\wwwroot\\_framework\\dotnet.js.map.gz",
   "${OutputPath}\\wwwroot\\_framework\\dotnet.native.js",
   "${OutputPath}\\wwwroot\\_framework\\dotnet.native.js.gz",
-  "${OutputPath}\\wwwroot\\_framework\\dotnet.native.js",
-  "${OutputPath}\\wwwroot\\_framework\\dotnet.native.js.gz",
   "${OutputPath}\\wwwroot\\_framework\\dotnet.native.wasm",
   "${OutputPath}\\wwwroot\\_framework\\dotnet.native.wasm.gz",
   "${OutputPath}\\wwwroot\\_framework\\dotnet.runtime.js",
   "${OutputPath}\\wwwroot\\_framework\\dotnet.runtime.js.gz",
-  "${OutputPath}\\wwwroot\\_framework\\dotnet.runtime.js",
-  "${OutputPath}\\wwwroot\\_framework\\dotnet.runtime.js.gz",
   "${OutputPath}\\wwwroot\\_framework\\dotnet.runtime.js.map",
   "${OutputPath}\\wwwroot\\_framework\\dotnet.runtime.js.map.gz",
   "${OutputPath}\\wwwroot\\_framework\\es-ES\\classlibrarywithsatelliteassemblies.resources.wasm",
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json
index 69d0f50dee37..45a1dbf6788d 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json
@@ -11588,7 +11588,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -17730,7 +17730,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -17804,7 +17804,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -18433,7 +18433,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -18470,7 +18470,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -18507,7 +18507,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -22325,7 +22325,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -22376,7 +22376,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -38925,7 +38925,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -38976,7 +38976,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -39125,7 +39125,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -39176,7 +39176,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -39825,7 +39825,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/x-gzip"
+          "Value": "text/plain"
         },
         {
           "Name": "ETag",
@@ -40825,7 +40825,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -40876,7 +40876,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -40925,7 +40925,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -40976,7 +40976,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -41025,7 +41025,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -41076,7 +41076,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json
index 79358fbdde1b..ee8d1e202822 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json
@@ -235,7 +235,7 @@
   "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat",
   "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat",
   "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat",
-  "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+  "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
   "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz",
   "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.js.gz",
   "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.native.js.gz",
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json
index 9113c294a1a6..684f74e675fa 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json
@@ -185,7 +185,7 @@
       "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_no_CJK.dat"
     },
     {
-      "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "SourceId": "blazorwasm-minimal",
       "SourceType": "Computed",
       "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\",
@@ -203,7 +203,7 @@
       "Integrity": "__integrity__",
       "CopyToOutputDirectory": "Never",
       "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazor.publish.boot.json"
+      "OriginalItemSpec": "obj\\Debug\\${Tfm}\\publish.blazor.boot.json"
     },
     {
       "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz",
@@ -2989,7 +2989,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "br",
       "Fingerprint": "__fingerprint__",
@@ -3010,7 +3010,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "gzip",
       "Fingerprint": "__fingerprint__",
@@ -5010,7 +5010,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -5047,7 +5047,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -5084,7 +5084,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -5104,7 +5104,7 @@
     },
     {
       "Route": "_framework/blazor.boot.json",
-      "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "Selectors": [],
       "ResponseHeaders": [
         {
@@ -19270,7 +19270,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -19321,7 +19321,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -19370,7 +19370,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -19421,7 +19421,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -19470,7 +19470,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -19521,7 +19521,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -19570,7 +19570,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -19621,7 +19621,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -19670,7 +19670,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -19721,7 +19721,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -19770,7 +19770,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -19821,7 +19821,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json
index 317752862bc5..0af2db05a6a2 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json
@@ -232,7 +232,7 @@
   "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat",
   "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat",
   "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat",
-  "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+  "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
   "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz",
   "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.js.gz",
   "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.native.js.gz",
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json
index ff21514b4b22..307408eaa015 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json
@@ -185,7 +185,7 @@
       "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_no_CJK.dat"
     },
     {
-      "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "SourceId": "blazorwasm-minimal",
       "SourceType": "Computed",
       "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\",
@@ -203,7 +203,7 @@
       "Integrity": "__integrity__",
       "CopyToOutputDirectory": "Never",
       "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazor.publish.boot.json"
+      "OriginalItemSpec": "obj\\Debug\\${Tfm}\\publish.blazor.boot.json"
     },
     {
       "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz",
@@ -2947,7 +2947,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "br",
       "Fingerprint": "__fingerprint__",
@@ -2968,7 +2968,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "gzip",
       "Fingerprint": "__fingerprint__",
@@ -5041,7 +5041,7 @@
     },
     {
       "Route": "_framework/blazor.boot.json",
-      "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "Selectors": [],
       "ResponseHeaders": [
         {
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json
index 7f37b65efa48..4037d82699d4 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json
@@ -299,7 +299,7 @@
       "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat"
     },
     {
-      "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "SourceId": "blazorwasm",
       "SourceType": "Project",
       "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\",
@@ -317,7 +317,7 @@
       "Integrity": "__integrity__",
       "CopyToOutputDirectory": "Never",
       "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json"
+      "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json"
     },
     {
       "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\Fake-License.txt.gz",
@@ -3187,7 +3187,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "br",
       "Fingerprint": "__fingerprint__",
@@ -3208,7 +3208,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "gzip",
       "Fingerprint": "__fingerprint__",
@@ -5755,7 +5755,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -5792,7 +5792,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -5829,7 +5829,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -5849,7 +5849,7 @@
     },
     {
       "Route": "_framework/blazor.boot.json",
-      "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "Selectors": [],
       "ResponseHeaders": [
         {
@@ -20415,7 +20415,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -20466,7 +20466,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -20515,7 +20515,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -20566,7 +20566,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -20615,7 +20615,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -20666,7 +20666,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -20715,7 +20715,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -20766,7 +20766,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -20815,7 +20815,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -20866,7 +20866,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -20915,7 +20915,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -20966,7 +20966,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json
index 317752862bc5..0af2db05a6a2 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json
@@ -232,7 +232,7 @@
   "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat",
   "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat",
   "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat",
-  "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+  "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
   "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz",
   "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.js.gz",
   "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.native.js.gz",
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json
index fef345cbcfed..80d768e2f769 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json
@@ -185,7 +185,7 @@
       "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_no_CJK.dat"
     },
     {
-      "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "SourceId": "blazorwasm-minimal",
       "SourceType": "Computed",
       "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\",
@@ -203,7 +203,7 @@
       "Integrity": "__integrity__",
       "CopyToOutputDirectory": "Never",
       "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazor.publish.boot.json"
+      "OriginalItemSpec": "obj\\Debug\\${Tfm}\\publish.blazor.boot.json"
     },
     {
       "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz",
@@ -2947,7 +2947,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "br",
       "Fingerprint": "__fingerprint__",
@@ -2968,7 +2968,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "gzip",
       "Fingerprint": "__fingerprint__",
@@ -5041,7 +5041,7 @@
     },
     {
       "Route": "_framework/blazor.boot.json",
-      "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "Selectors": [],
       "ResponseHeaders": [
         {
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json
index daf71d760e00..9d88ae08828e 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json
@@ -235,7 +235,7 @@
   "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat",
   "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_EFIGS.dat",
   "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat",
-  "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+  "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
   "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz",
   "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.js.gz",
   "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\dotnet.native.js.gz",
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json
index 324cc4216a0c..b82bd803f7c8 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json
@@ -185,7 +185,7 @@
       "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\icudt_no_CJK.dat"
     },
     {
-      "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "SourceId": "blazorwasm-minimal",
       "SourceType": "Computed",
       "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\",
@@ -203,7 +203,7 @@
       "Integrity": "__integrity__",
       "CopyToOutputDirectory": "Never",
       "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "obj\\Debug\\${Tfm}\\blazor.publish.boot.json"
+      "OriginalItemSpec": "obj\\Debug\\${Tfm}\\publish.blazor.boot.json"
     },
     {
       "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz",
@@ -2989,7 +2989,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "br",
       "Fingerprint": "__fingerprint__",
@@ -3010,7 +3010,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "gzip",
       "Fingerprint": "__fingerprint__",
@@ -5167,7 +5167,7 @@
     },
     {
       "Route": "_framework/blazor.boot.json",
-      "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "Selectors": [],
       "ResponseHeaders": [
         {
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json
index b324defb3ec9..d745c620e67c 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json
@@ -236,7 +236,7 @@
       "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat"
     },
     {
-      "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "SourceId": "blazorwasm",
       "SourceType": "Project",
       "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\",
@@ -254,7 +254,7 @@
       "Integrity": "__integrity__",
       "CopyToOutputDirectory": "Never",
       "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json"
+      "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json"
     },
     {
       "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\Fake-License.txt.gz",
@@ -3082,7 +3082,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "br",
       "Fingerprint": "__fingerprint__",
@@ -3103,7 +3103,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "gzip",
       "Fingerprint": "__fingerprint__",
@@ -5486,7 +5486,7 @@
     },
     {
       "Route": "_framework/blazor.boot.json",
-      "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "Selectors": [],
       "ResponseHeaders": [
         {
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json
index b324defb3ec9..d745c620e67c 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json
@@ -236,7 +236,7 @@
       "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_no_CJK.dat"
     },
     {
-      "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "SourceId": "blazorwasm",
       "SourceType": "Project",
       "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\",
@@ -254,7 +254,7 @@
       "Integrity": "__integrity__",
       "CopyToOutputDirectory": "Never",
       "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json"
+      "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json"
     },
     {
       "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\Fake-License.txt.gz",
@@ -3082,7 +3082,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "br",
       "Fingerprint": "__fingerprint__",
@@ -3103,7 +3103,7 @@
       "AssetRole": "Alternative",
       "AssetMergeBehavior": "",
       "AssetMergeSource": "",
-      "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "AssetTraitName": "Content-Encoding",
       "AssetTraitValue": "gzip",
       "Fingerprint": "__fingerprint__",
@@ -5486,7 +5486,7 @@
     },
     {
       "Route": "_framework/blazor.boot.json",
-      "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\blazor.publish.boot.json",
+      "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\publish.blazor.boot.json",
       "Selectors": [],
       "ResponseHeaders": [
         {
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs
index f727d627a0cf..cbe457917e72 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs
@@ -8,7 +8,7 @@ namespace Microsoft.NET.Sdk.BlazorWebAssembly.Tests
 {
     public class WasmBuildIncrementalismTest(ITestOutputHelper log) : AspNetSdkTest(log)
     {
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_IsIncremental()
         {
             // Arrange
@@ -46,7 +46,7 @@ public void Build_IsIncremental()
             }
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_GzipCompression_IsIncremental()
         {
             // Arrange
@@ -93,7 +93,7 @@ public void Build_GzipCompression_IsIncremental()
             }
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_SatelliteAssembliesFileIsPreserved()
         {
             // Arrange
@@ -156,7 +156,7 @@ void Verify()
             }
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_SatelliteAssembliesFileIsCreated_IfNewFileIsAdded()
         {
             // Arrange
@@ -206,7 +206,7 @@ public void Build_SatelliteAssembliesFileIsCreated_IfNewFileIsAdded()
             kvp.Value.Should().ContainKey("blazorwasm.resources.wasm");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_SatelliteAssembliesFileIsDeleted_IfAllSatelliteFilesAreRemoved()
         {
             // Arrange
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs
index 15e34c3267a7..0672e137d9ee 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs
@@ -18,7 +18,7 @@ public class WasmBuildIntegrationTest(ITestOutputHelper log) : BlazorWasmBaselin
             "icudt_no_CJK.dat"
         };
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void BuildMinimal_Works()
         {
             // Arrange
@@ -49,7 +49,7 @@ public void BuildMinimal_Works()
             new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "blazorwasm-minimal.wasm")).Should().Exist();
         }
 
-        [Theory]
+        [RequiresMSBuildVersionTheory("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         [InlineData("blazor")]
         [InlineData("blazor spaces")]
         public void Build_Works(string identifier)
@@ -86,7 +86,7 @@ public void Build_Works(string identifier)
             new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "RazorClassLibrary.wasm")).Should().Exist();
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_Works_WithLibraryUsingHintPath()
         {
             // Arrange
@@ -138,7 +138,7 @@ public void Build_Works_WithLibraryUsingHintPath()
             new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "RazorClassLibrary.wasm")).Should().Exist();
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_InRelease_Works()
         {
             // Arrange
@@ -176,7 +176,7 @@ public void Build_InRelease_Works()
             new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "RazorClassLibrary.wasm")).Should().Exist();
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_ProducesBootJsonDataWithExpectedContent()
         {
             // Arrange
@@ -223,7 +223,7 @@ public void Build_ProducesBootJsonDataWithExpectedContent()
             bootJsonData.config.Should().Contain("../appsettings.development.json");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_InRelease_ProducesBootJsonDataWithExpectedContent()
         {
             // Arrange
@@ -267,7 +267,7 @@ public void Build_InRelease_ProducesBootJsonDataWithExpectedContent()
             bootJsonData.resources.satelliteResources.Should().BeNull();
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_WithBlazorEnableTimeZoneSupportDisabled_DoesNotCopyTimeZoneInfo()
         {
             // Arrange
@@ -299,7 +299,7 @@ public void Build_WithBlazorEnableTimeZoneSupportDisabled_DoesNotCopyTimeZoneInf
             new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "dotnet.timezones.blat")).Should().NotExist();
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_WithInvariantGlobalizationEnabled_DoesNotCopyGlobalizationData()
         {
             // Arrange
@@ -337,7 +337,7 @@ public void Build_WithInvariantGlobalizationEnabled_DoesNotCopyGlobalizationData
             }
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_WithInvariantGlobalizationEnabled_DoesNotCopyGlobalizationData()
         {
             // Arrange
@@ -375,7 +375,7 @@ public void Publish_WithInvariantGlobalizationEnabled_DoesNotCopyGlobalizationDa
             }
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_WithBlazorWebAssemblyLoadCustomGlobalizationData_SetsGlobalizationMode()
         {
             // Arrange
@@ -419,7 +419,7 @@ public void Build_WithBlazorWebAssemblyLoadCustomGlobalizationData_SetsGlobaliza
             }
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_WithBlazorWebAssemblyLoadCustomGlobalizationData_SetsGlobalizationMode()
         {
             var testAppName = "BlazorHosted";
@@ -462,7 +462,7 @@ public void Publish_WithBlazorWebAssemblyLoadCustomGlobalizationData_SetsGlobali
             }
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_WithBlazorWebAssemblyLoadAllGlobalizationData_SetsICUDataMode()
         {
             // Arrange
@@ -506,7 +506,7 @@ public void Build_WithBlazorWebAssemblyLoadAllGlobalizationData_SetsICUDataMode(
             }
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_WithBlazorWebAssemblyLoadAllGlobalizationData_SetsGlobalizationMode()
         {
             // Arrange
@@ -550,7 +550,7 @@ public void Publish_WithBlazorWebAssemblyLoadAllGlobalizationData_SetsGlobalizat
             }
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_Hosted_Works()
         {
             // Arrange
@@ -622,7 +622,7 @@ public void Build_SatelliteAssembliesAreCopiedToBuildOutput()
             bootJsonPath.Should().Contain("\"Microsoft.CodeAnalysis.CSharp.resources.wasm\"");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_WithCustomOutputPath_Works()
         {
             var testAppName = "BlazorWasmWithLibrary";
@@ -644,7 +644,7 @@ public void Build_WithCustomOutputPath_Works()
             ExecuteCommand(buildCommand).Should().Pass();
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_WithTransitiveReference_Works()
         {
             // Regression test for https://github.com/dotnet/aspnetcore/issues/37574.
@@ -700,7 +700,7 @@ public class TestReference
             fileInWwwroot.Should().Exist();
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_WithReference_Works()
         {
             // Regression test for https://github.com/dotnet/aspnetcore/issues/37574.
@@ -763,14 +763,14 @@ public class TestReference
             fileInWwwroot.Should().Exist();
         }
 
-        [Theory]
+        [RequiresMSBuildVersionTheory("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         [InlineData(true)]
         [InlineData(false)]
         [InlineData(null)]
         public void Build_WithStartupMemoryCache(bool? value)
             => BuildWasmMinimalAndValidateBootConfig(new[] { ("BlazorWebAssemblyStartupMemoryCache", value?.ToString()) }, b => b.startupMemoryCache.Should().Be(value));
 
-        [Theory]
+        [RequiresMSBuildVersionTheory("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         [InlineData(true)]
         [InlineData(false)]
         [InlineData(null)]
@@ -788,7 +788,7 @@ public void Build_WithJiterpreter(bool? value)
                 }
             });
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_WithJiterpreter_Advanced()
             => BuildWasmMinimalAndValidateBootConfig(new[] { ("BlazorWebAssemblyJiterpreter", "true"), ("BlazorWebAssemblyRuntimeOptions", "--no-jiterpreter-interp-entry-enabled") }, b =>
             {
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildLazyLoadTest.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildLazyLoadTest.cs
index 1ba27e1bb268..6484b0acdaba 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildLazyLoadTest.cs
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildLazyLoadTest.cs
@@ -10,7 +10,7 @@ public class WasmBuildLazyLoadTest : AspNetSdkTest
     {
         public WasmBuildLazyLoadTest(ITestOutputHelper log) : base(log) { }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_LazyLoadExplicitAssembly_Debug_Works()
         {
             // Arrange
@@ -62,7 +62,7 @@ public void Build_LazyLoadExplicitAssembly_Debug_Works()
             assemblies.Keys.Should().Contain("blazorwasm.wasm");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_LazyLoadExplicitAssembly_Release_Works()
         {
             // Arrange
@@ -114,7 +114,7 @@ public void Build_LazyLoadExplicitAssembly_Release_Works()
             assemblies.Keys.Should().Contain("blazorwasm.wasm");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_LazyLoadExplicitAssembly_Debug_Works()
         {
             // Arrange
@@ -166,7 +166,7 @@ public void Publish_LazyLoadExplicitAssembly_Debug_Works()
             assemblies.Keys.Should().Contain("blazorwasm.wasm");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_LazyLoadExplicitAssembly_Release_Works()
         {
             // Arrange
@@ -218,7 +218,7 @@ public void Publish_LazyLoadExplicitAssembly_Release_Works()
             assemblies.Keys.Should().Contain("blazorwasm.wasm");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_LazyLoadExplicitAssembly_InvalidAssembly()
         {
             // Arrange
@@ -239,7 +239,7 @@ public void Build_LazyLoadExplicitAssembly_InvalidAssembly()
             ExecuteCommand(buildCommand).Should().Fail().And.HaveStdOutContaining("BLAZORSDK1001");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_LazyLoadExplicitAssembly_InvalidAssembly()
         {
             // Arrange
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmCompressionTests.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmCompressionTests.cs
index b99e39fb7eb9..63426a14dea9 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmCompressionTests.cs
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmCompressionTests.cs
@@ -7,7 +7,7 @@ public class WasmCompressionTests : AspNetSdkTest
     {
         public WasmCompressionTests(ITestOutputHelper log) : base(log) { }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_UpdatesFilesWhenSourcesChange()
         {
             // Arrange
@@ -60,7 +60,7 @@ public void Publish_UpdatesFilesWhenSourcesChange()
             Assert.NotEqual(blazorBootJsonCompressedThumbPrint, newBlazorBootJsonCompressedThumbPrint);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_WithoutLinkerAndCompression_UpdatesFilesWhenSourcesChange()
         {
             // Arrange
@@ -104,7 +104,7 @@ public void Publish_WithoutLinkerAndCompression_UpdatesFilesWhenSourcesChange()
             Assert.NotEqual(mainAppCompressedDllThumbPrint, newMainAppCompressedDllThumbPrint);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_WithLinkerAndCompression_IsIncremental()
         {
             // Arrange
@@ -136,7 +136,7 @@ public void Publish_WithLinkerAndCompression_IsIncremental()
             }
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_WithoutLinkerAndCompression_IsIncremental()
         {
             // Arrange
@@ -168,7 +168,7 @@ public void Publish_WithoutLinkerAndCompression_IsIncremental()
             }
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_CompressesAllFrameworkFiles()
         {
             // Arrange
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmJsModulesIntegrationTests.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmJsModulesIntegrationTests.cs
index 04a237960a0c..82f437096aa7 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmJsModulesIntegrationTests.cs
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmJsModulesIntegrationTests.cs
@@ -8,7 +8,7 @@ namespace Microsoft.NET.Sdk.BlazorWebAssembly.Tests
 {
     public class WasmJsModulesIntegrationTests(ITestOutputHelper log) : BlazorWasmBaselineTests(log, GenerateBaselines)
     {
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest()
         {
             // Arrange
@@ -46,7 +46,7 @@ public void Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonM
             new FileInfo(Path.Combine(outputPath, "wwwroot", "blazorwasm-minimal.modules.json")).Should().NotExist();
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void JSModules_ManifestIncludesModuleTargetPaths()
         {
             // Arrange
@@ -92,7 +92,7 @@ public void JSModules_ManifestIncludesModuleTargetPaths()
             new FileInfo(Path.Combine(outputPath, "wwwroot", "blazorhosted.modules.json")).Should().NotExist();
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest()
         {
             // Arrange
@@ -120,7 +120,7 @@ public void Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJso
             var manifest = StaticWebAssetsManifest.FromJsonBytes(File.ReadAllBytes(path));
             AssertManifest(manifest, LoadPublishManifest());
 
-            var blazorBootJson = new FileInfo(Path.Combine(intermediateOutputPath, "blazor.publish.boot.json"));
+            var blazorBootJson = new FileInfo(Path.Combine(intermediateOutputPath, "publish.blazor.boot.json"));
             blazorBootJson.Should().Exist();
             var contents = JsonSerializer.Deserialize<JsonDocument>(blazorBootJson.OpenRead());
             contents.RootElement.TryGetProperty("resources", out var resources).Should().BeTrue();
@@ -139,7 +139,7 @@ public void Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJso
                 intermediateOutputPath);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void JsModules_CanHaveDifferentBuildAndPublishModules()
         {
             // Arrange
@@ -183,7 +183,7 @@ public void JsModules_CanHaveDifferentBuildAndPublishModules()
             AssertManifest(manifest, LoadPublishManifest());
 
             var buildLibrary = GetLibraryInitializer(Path.Combine(intermediateOutputPath, "blazor.boot.json"));
-            var publishLibrary = GetLibraryInitializer(Path.Combine(intermediateOutputPath, "blazor.publish.boot.json"));
+            var publishLibrary = GetLibraryInitializer(Path.Combine(intermediateOutputPath, "publish.blazor.boot.json"));
 
             publishLibrary.GetString().Should().NotBe(buildLibrary.GetString());
 
@@ -257,8 +257,8 @@ public void JsModules_CanCustomizeBlazorInitialization()
             var manifest = StaticWebAssetsManifest.FromJsonBytes(File.ReadAllBytes(path));
             AssertManifest(manifest, LoadPublishManifest());
 
-            var publishExtension = GetPublishExtension(Path.Combine(intermediateOutputPath, "blazor.publish.boot.json"));
-            GetPublishExtensionEntriesCount(Path.Combine(intermediateOutputPath, "blazor.publish.boot.json")).Should().Be(1);
+            var publishExtension = GetPublishExtension(Path.Combine(intermediateOutputPath, "publish.blazor.boot.json"));
+            GetPublishExtensionEntriesCount(Path.Combine(intermediateOutputPath, "publish.blazor.boot.json")).Should().Be(1);
 
             new FileInfo(Path.Combine(outputPath, "wwwroot", "blazorwasm-minimal.modules.json")).Should().NotExist();
             var lib = new FileInfo(Path.Combine(outputPath, "wwwroot", "blazorwasm-minimal.lib.module.js"));
@@ -328,7 +328,7 @@ public void JsModules_Hosted_CanCustomizeBlazorInitialization()
             var manifest = StaticWebAssetsManifest.FromJsonBytes(File.ReadAllBytes(path));
             AssertManifest(manifest, LoadPublishManifest());
 
-            var publishExtension = GetPublishExtension(Path.Combine(intermediateOutputPath.Replace("blazorhosted", "blazorwasm"), "blazor.publish.boot.json"));
+            var publishExtension = GetPublishExtension(Path.Combine(intermediateOutputPath.Replace("blazorhosted", "blazorwasm"), "publish.blazor.boot.json"));
 
             new FileInfo(Path.Combine(outputPath, "wwwroot", "blazorhosted.modules.json")).Should().Exist();
             var lib = new FileInfo(Path.Combine(outputPath, "wwwroot", "blazorwasm.lib.module.js"));
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs
index 24da76d1503b..a78cdb4d2d8a 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs
@@ -12,7 +12,7 @@ public class WasmPublishIntegrationTest : WasmPublishIntegrationTestBase
     {
         public WasmPublishIntegrationTest(ITestOutputHelper log) : base(log) { }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_MinimalApp_Works()
         {
             // Arrange
@@ -51,7 +51,7 @@ public void Publish_MinimalApp_Works()
             VerifyBootManifestHashes(testInstance, Path.Combine(publishDirectory.ToString(), "wwwroot"));
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_WithDefaultSettings_Works()
         {
             // Arrange
@@ -103,7 +103,7 @@ public void Publish_WithDefaultSettings_Works()
             VerifyTypeGranularTrimming(blazorPublishDirectory);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_Works_WithLibraryUsingHintPath()
         {
             // Arrange
@@ -156,7 +156,7 @@ public void Publish_Works_WithLibraryUsingHintPath()
             new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "RazorClassLibrary.wasm")).Should().Exist();
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_WithScopedCss_Works()
         {
             // Arrange
@@ -205,7 +205,7 @@ public void Publish_WithScopedCss_Works()
                 assetsManifestPath: "custom-service-worker-assets.js");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_InRelease_Works()
         {
             // Arrange
@@ -249,7 +249,7 @@ public void Publish_InRelease_Works()
             new FileInfo(Path.Combine(blazorPublishDirectory, "css", "app.css")).Should().Contain(".publish");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_WithExistingWebConfig_Works()
         {
             // Arrange
@@ -269,7 +269,7 @@ public void Publish_WithExistingWebConfig_Works()
             webConfig.Should().Contain(webConfigContents);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_WithNoBuild_Works()
         {
             // Arrange
@@ -318,7 +318,7 @@ public void Publish_WithNoBuild_Works()
             VerifyCompression(testInstance, blazorPublishDirectory);
         }
 
-        [Theory]
+        [RequiresMSBuildVersionTheory("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         [InlineData("different-path")]
         [InlineData("/different-path")]
         public void Publish_WithStaticWebBasePathWorks(string basePath)
@@ -381,7 +381,7 @@ public void Publish_WithStaticWebBasePathWorks(string basePath)
                 staticWebAssetsBasePath: "different-path");
         }
 
-        [Theory]
+        [RequiresMSBuildVersionTheory("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         [InlineData("different-path/")]
         [InlineData("/different-path/")]
         public void Publish_Hosted_WithStaticWebBasePathWorks(string basePath)
@@ -449,7 +449,7 @@ private static void VerifyCompression(TestAsset testAsset, string blazorPublishD
             uncompressedText.Should().Be(originalText);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_WithTrimmingdDisabled_Works()
         {
             // Arrange
@@ -572,7 +572,7 @@ public void Publish_SatelliteAssemblies_AreCopiedToBuildOutput()
             VerifyBootManifestHashes(testInstance, blazorPublishDirectory);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_HostedApp_DefaultSettings_Works()
         {
             // Arrange
@@ -665,7 +665,7 @@ public void Publish_HostedApp_DefaultSettings_Works()
             VerifyTypeGranularTrimming(blazorPublishDirectory);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_HostedApp_ProducesBootJsonDataWithExpectedContent()
         {
             // Arrange
@@ -766,7 +766,7 @@ public void Publish_HostedApp_WithSatelliteAssemblies()
             bootJsonData.Should().Contain("\"Microsoft.CodeAnalysis.CSharp.resources.wasm\"");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         // Regression test for https://github.com/dotnet/aspnetcore/issues/18752
         public void Publish_HostedApp_WithoutTrimming_Works()
         {
@@ -867,7 +867,7 @@ public void Publish_HostedApp_WithoutTrimming_Works()
                 assetsManifestPath: "custom-service-worker-assets.js");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_HostedApp_WithNoBuild_Works()
         {
             // Arrange
@@ -929,7 +929,7 @@ public void Publish_HostedApp_WithNoBuild_Works()
                 assetsManifestPath: "custom-service-worker-assets.js");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_HostedApp_VisualStudio()
         {
             // Simulates publishing the same way VS does by setting BuildProjectReferences=false.
@@ -1023,7 +1023,7 @@ public void Publish_HostedApp_VisualStudio()
                 assetsManifestPath: "custom-service-worker-assets.js");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_HostedAppWithScopedCss_VisualStudio()
         {
             // Simulates publishing the same way VS does by setting BuildProjectReferences=false.
@@ -1187,7 +1187,7 @@ public void Publish_HostedApp_VisualStudio_WithSatelliteAssemblies()
             VerifyBootManifestHashes(testInstance, blazorPublishDirectory);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_HostedApp_WithRidSpecifiedInCLI_Works()
         {
             // Arrange
@@ -1210,7 +1210,7 @@ public void Publish_HostedApp_WithRidSpecifiedInCLI_Works()
             AssertRIDPublishOutput(publishCommand, testInstance, hosted: true);
         }
 
-        [ConditionalFact()]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works()
         {
             // Arrange
@@ -1272,7 +1272,7 @@ public void Publish_HostedApp_WithRidSpecifiedAsArgument_Works()
             AssertRIDPublishOutput(publishCommand, testInstance, hosted: true);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_HostedApp_WithRid_Works()
         {
             // Arrange
@@ -1457,7 +1457,7 @@ private void AssertRIDPublishOutput(DotnetPublishCommand command, TestAsset test
                 assetsManifestPath: "custom-service-worker-assets.js");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_WithInvariantGlobalizationEnabled_DoesNotCopyGlobalizationData()
         {
             // Arrange
@@ -1493,7 +1493,7 @@ public void Publish_WithInvariantGlobalizationEnabled_DoesNotCopyGlobalizationDa
             new FileInfo(Path.Combine(publishOutputDirectory, "wwwroot", "_framework", "icudt_no_CJK.dat")).Should().NotExist();
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_HostingMultipleBlazorWebApps_Works()
         {
             // Regression test for https://github.com/dotnet/aspnetcore/issues/29264
@@ -1554,7 +1554,7 @@ public void Publish_HostingMultipleBlazorWebApps_Works()
             new FileInfo(Path.Combine(secondAppPublishDirectory, "_framework", "Newtonsoft.Json.wasm.br")).Should().NotExist();
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_WithTransitiveReference_Works()
         {
             // Regression test for https://github.com/dotnet/aspnetcore/issues/37574.
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPwaManifestTests.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPwaManifestTests.cs
index ce6cb8965a43..b04c3f3a1b2a 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPwaManifestTests.cs
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPwaManifestTests.cs
@@ -10,7 +10,7 @@ namespace Microsoft.NET.Sdk.BlazorWebAssembly.Tests
 {
     public class WasmPwaManifestTests(ITestOutputHelper log) : AspNetSdkTest(log)
     {
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_ServiceWorkerAssetsManifest_Works()
         {
             // Arrange
@@ -58,7 +58,7 @@ public void Build_ServiceWorkerAssetsManifest_Works()
                assetsManifestPath: "service-worker-assets.js");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_HostedAppWithServiceWorker_Works()
         {
             // Arrange
@@ -84,7 +84,7 @@ public void Build_HostedAppWithServiceWorker_Works()
             entries.Should().Contain(e => expectedExtensions.Contains(Path.GetExtension(e)));
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void PublishWithPWA_ProducesAssets()
         {
             // Arrange
@@ -112,7 +112,7 @@ public void PublishWithPWA_ProducesAssets()
             // Assert.FileContainsLine(result, serviceWorkerFile, "// This is the production service worker");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void PublishHostedWithPWA_ProducesAssets()
         {
             // Arrange
@@ -140,7 +140,7 @@ public void PublishHostedWithPWA_ProducesAssets()
             // Assert.FileContainsLine(result, serviceWorkerFile, "// This is the production service worker");
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_UpdatesServiceWorkerVersionHash_WhenSourcesChange()
         {
             // Arrange
@@ -190,7 +190,7 @@ public void Publish_UpdatesServiceWorkerVersionHash_WhenSourcesChange()
             updatedCapture.Should().NotBe(capture);
         }
 
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Publish_DeterministicAcrossBuilds_WhenNoSourcesChange()
         {
             // Arrange
diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetEndpointsIntegrationTest.cs b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetEndpointsIntegrationTest.cs
index 7c7cb64cec2c..b82c920fc748 100644
--- a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetEndpointsIntegrationTest.cs
+++ b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetEndpointsIntegrationTest.cs
@@ -395,7 +395,7 @@ public void Publish_CreatesEndpointsForAssets_BuildAndPublish_Assets()
         AssertManifest(publishManifest, LoadPublishManifest());
     }
 
-    [Fact]
+    [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
     public void Build_EndpointManifest_ContainsEndpoints()
     {
         // Arrange
@@ -422,7 +422,7 @@ public void Build_EndpointManifest_ContainsEndpoints()
         VerifyEndpointsCollection(buildOutputDirectory, "blazorwasm", readFromDevManifest: true);
     }
 
-    [Fact]
+    [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
     public void BuildHosted_EndpointManifest_ContainsEndpoints()
     {
         // Arrange
@@ -448,7 +448,7 @@ public void BuildHosted_EndpointManifest_ContainsEndpoints()
         VerifyEndpointsCollection(buildOutputDirectory, "blazorhosted", readFromDevManifest: true);
     }
 
-    [Fact]
+    [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
     public void Publish_EndpointManifestContainsEndpoints()
     {
         // Arrange
@@ -473,7 +473,7 @@ public void Publish_EndpointManifestContainsEndpoints()
         VerifyEndpointsCollection(publishOutputDirectory, "blazorwasm");
     }
 
-    [Fact]
+    [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
     public void PublishHosted_EndpointManifest_ContainsEndpoints()
     {
         // Arrange
diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsCrossTargetingTests.cs b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsCrossTargetingTests.cs
index de441891fecf..1a71394ad1c1 100644
--- a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsCrossTargetingTests.cs
+++ b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsCrossTargetingTests.cs
@@ -12,7 +12,7 @@ public class StaticWebAssetsCrossTargetingTests(ITestOutputHelper log)
         : IsolatedNuGetPackageFolderAspNetSdkBaselineTest(log, nameof(StaticWebAssetsCrossTargetingTests))
     {
         // Build Standalone project
-        [Fact]
+        [RequiresMSBuildVersionFact("17.12", Reason = "Needs System.Text.Json 8.0.5")]
         public void Build_CrosstargetingTests_CanIncludeBrowserAssets()
         {
             var expectedManifest = LoadBuildManifest();
diff --git a/test/Microsoft.NET.TestFramework/Attributes/RequiresMSBuildVersionFactAttribute.cs b/test/Microsoft.NET.TestFramework/Attributes/RequiresMSBuildVersionFactAttribute.cs
index bc388a631c77..583255c87145 100644
--- a/test/Microsoft.NET.TestFramework/Attributes/RequiresMSBuildVersionFactAttribute.cs
+++ b/test/Microsoft.NET.TestFramework/Attributes/RequiresMSBuildVersionFactAttribute.cs
@@ -5,6 +5,11 @@ namespace Microsoft.NET.TestFramework
 {
     public class RequiresMSBuildVersionFactAttribute : FactAttribute
     {
+        /// <summary>
+        /// Can be used to document the reason a test needs a specific version of MSBuild
+        /// </summary>
+        public string Reason { get; set; }
+
         public RequiresMSBuildVersionFactAttribute(string version)
         {
             RequiresMSBuildVersionTheoryAttribute.CheckForRequiredMSBuildVersion(this, version);
diff --git a/test/Microsoft.NET.TestFramework/Attributes/RequiresMSBuildVersionTheoryAttribute.cs b/test/Microsoft.NET.TestFramework/Attributes/RequiresMSBuildVersionTheoryAttribute.cs
index 33b5eaa77034..690a2e45b964 100644
--- a/test/Microsoft.NET.TestFramework/Attributes/RequiresMSBuildVersionTheoryAttribute.cs
+++ b/test/Microsoft.NET.TestFramework/Attributes/RequiresMSBuildVersionTheoryAttribute.cs
@@ -5,6 +5,11 @@ namespace Microsoft.NET.TestFramework
 {
     public class RequiresMSBuildVersionTheoryAttribute : TheoryAttribute
     {
+        /// <summary>
+        /// Can be used to document the reason a test needs a specific version of MSBuild
+        /// </summary>
+        public string Reason { get; set; }
+
         public RequiresMSBuildVersionTheoryAttribute(string version)
         {
             CheckForRequiredMSBuildVersion(this, version);