dotnet · tmat · Nov 5, 2025 · Oct 7, 2025 · Oct 7, 2025 · Oct 7, 2025
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
@@ -34,3 +34,8 @@ Localization:
 
 Documentation:
 - Do not manually edit files under documentation/manpages/sdk as these are generated based on documentation and should not be manually modified.
+
+External Dependencies:
+- Changes that require modifications to the dotnet/templating repository (Microsoft.TemplateEngine packages) should be made directly in that repository, not worked around in this repo.
+- The dotnet/templating repository owns the TemplateEngine.Edge, TemplateEngine.Abstractions, and related packages.
+- If a change requires updates to template engine behavior or formatting (e.g., DisplayName properties), file an issue in dotnet/templating and make the changes there rather than adding workarounds in this SDK repository.
@@ -5,7 +5,7 @@ trigger:
   branches:
     include:
     - main
-    - release/10.0.1*
+    - release/10.0.2*
     - internal/release/*
     - exp/*
 

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -52,7 +52,7 @@
     <PackageVersion Include="Microsoft.DotNet.Build.Tasks.Workloads" Version="$(MicrosoftDotNetBuildTasksWorkloadsPackageVersion)" />
     <PackageVersion Include="Microsoft.DotNet.Installer.Windows.Security.TestData" Version="$(MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion)" />
     <PackageVersion Include="Microsoft.DotNet.SignCheck" Version="$(ArcadeSdkVersion)" />
-    <PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
+    <PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />

diff --git a/NuGet.config b/NuGet.config
@@ -3,6 +3,8 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-dotnet -->
+    <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from microsoft-testfx -->
     <!--  End: Package sources from microsoft-testfx -->
     <!--  Begin: Package sources from dotnet-aspire -->

diff --git a/eng/SourcePackage.netframework.editorconfig b/eng/SourcePackage.netframework.editorconfig
@@ -18,4 +18,32 @@ dotnet_diagnostic.CS1573.severity = none
 dotnet_diagnostic.IDE0005.severity = none
 
 # Disable nullability checks when targeting .NET Framework
-dotnet_diagnostic.CS8604.severity = none
+dotnet_diagnostic.CS8774.severity = none # Member not null
+dotnet_diagnostic.CS8775.severity = none # Member not null when
+dotnet_diagnostic.CS8776.severity = none # Member not null bad member
+dotnet_diagnostic.CS8777.severity = none # Parameter disallows null
+dotnet_diagnostic.CS8778.severity = none # Const out of range checked
+dotnet_diagnostic.CS8600.severity = none # Converting nullable to non-nullable
+dotnet_diagnostic.CS8601.severity = none # Null reference assignment
+dotnet_diagnostic.CS8602.severity = none # Null reference receiver
+dotnet_diagnostic.CS8603.severity = none # Null reference return
+dotnet_diagnostic.CS8604.severity = none # Null reference argument
+dotnet_diagnostic.CS8605.severity = none # Unbox possible null
+dotnet_diagnostic.CS8607.severity = none # Disallow null attribute forbids maybe null assignment
+dotnet_diagnostic.CS8608.severity = none # Nullability mismatch in type on override
+dotnet_diagnostic.CS8609.severity = none # Nullability mismatch in return type on override
+dotnet_diagnostic.CS8610.severity = none # Nullability mismatch in parameter type on override
+dotnet_diagnostic.CS8611.severity = none # Nullability mismatch in parameter type on partial
+dotnet_diagnostic.CS8612.severity = none # Nullability mismatch in type on implicit implementation
+dotnet_diagnostic.CS8613.severity = none # Nullability mismatch in return type on implicit implementation
+dotnet_diagnostic.CS8614.severity = none # Nullability mismatch in parameter type on implicit implementation
+dotnet_diagnostic.CS8615.severity = none # Nullability mismatch in type on explicit implementation
+dotnet_diagnostic.CS8616.severity = none # Nullability mismatch in return type on explicit implementation
+dotnet_diagnostic.CS8617.severity = none # Nullability mismatch in parameter type on explicit implementation
+dotnet_diagnostic.CS8618.severity = none # Uninitialized non-nullable field
+dotnet_diagnostic.CS8619.severity = none # Nullability mismatch in assignment
+dotnet_diagnostic.CS8620.severity = none # Nullability mismatch in argument
+dotnet_diagnostic.CS8621.severity = none # Nullability mismatch in return type of target delegate
+dotnet_diagnostic.CS8622.severity = none # Nullability mismatch in parameter type of target delegate
+dotnet_diagnostic.CS8624.severity = none # Nullability mismatch in argument for output
+dotnet_diagnostic.CS8625.severity = none # Null as non-nullable
diff --git a/eng/SourcePackage.netstandard.editorconfig b/eng/SourcePackage.netstandard.editorconfig
@@ -18,4 +18,32 @@ dotnet_diagnostic.CS1573.severity = none
 dotnet_diagnostic.IDE0005.severity = none
 
 # Disable nullability checks when targeting netstandard2.0
-dotnet_diagnostic.CS8604.severity = none
+dotnet_diagnostic.CS8774.severity = none # Member not null
+dotnet_diagnostic.CS8775.severity = none # Member not null when
+dotnet_diagnostic.CS8776.severity = none # Member not null bad member
+dotnet_diagnostic.CS8777.severity = none # Parameter disallows null
+dotnet_diagnostic.CS8778.severity = none # Const out of range checked
+dotnet_diagnostic.CS8600.severity = none # Converting nullable to non-nullable
+dotnet_diagnostic.CS8601.severity = none # Null reference assignment
+dotnet_diagnostic.CS8602.severity = none # Null reference receiver
+dotnet_diagnostic.CS8603.severity = none # Null reference return
+dotnet_diagnostic.CS8604.severity = none # Null reference argument
+dotnet_diagnostic.CS8605.severity = none # Unbox possible null
+dotnet_diagnostic.CS8607.severity = none # Disallow null attribute forbids maybe null assignment
+dotnet_diagnostic.CS8608.severity = none # Nullability mismatch in type on override
+dotnet_diagnostic.CS8609.severity = none # Nullability mismatch in return type on override
+dotnet_diagnostic.CS8610.severity = none # Nullability mismatch in parameter type on override
+dotnet_diagnostic.CS8611.severity = none # Nullability mismatch in parameter type on partial
+dotnet_diagnostic.CS8612.severity = none # Nullability mismatch in type on implicit implementation
+dotnet_diagnostic.CS8613.severity = none # Nullability mismatch in return type on implicit implementation
+dotnet_diagnostic.CS8614.severity = none # Nullability mismatch in parameter type on implicit implementation
+dotnet_diagnostic.CS8615.severity = none # Nullability mismatch in type on explicit implementation
+dotnet_diagnostic.CS8616.severity = none # Nullability mismatch in return type on explicit implementation
+dotnet_diagnostic.CS8617.severity = none # Nullability mismatch in parameter type on explicit implementation
+dotnet_diagnostic.CS8618.severity = none # Uninitialized non-nullable field
+dotnet_diagnostic.CS8619.severity = none # Nullability mismatch in assignment
+dotnet_diagnostic.CS8620.severity = none # Nullability mismatch in argument
+dotnet_diagnostic.CS8621.severity = none # Nullability mismatch in return type of target delegate
+dotnet_diagnostic.CS8622.severity = none # Nullability mismatch in parameter type of target delegate
+dotnet_diagnostic.CS8624.severity = none # Nullability mismatch in argument for output
+dotnet_diagnostic.CS8625.severity = none # Null as non-nullable
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
@@ -146,7 +146,7 @@ This file should be imported by eng/Versions.props
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>
-    <!-- dotnet/dotnet dependencies -->
+    <!-- _git/dotnet-dotnet dependencies -->
     <dotnetdevcertsVersion>$(dotnetdevcertsPackageVersion)</dotnetdevcertsVersion>
     <dotnetuserjwtsVersion>$(dotnetuserjwtsPackageVersion)</dotnetuserjwtsVersion>
     <dotnetusersecretsVersion>$(dotnetusersecretsPackageVersion)</dotnetusersecretsVersion>
@@ -187,16 +187,8 @@ This file should be imported by eng/Versions.props
     <MicrosoftCodeAnalysisWorkspacesMSBuildVersion>$(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
     <MicrosoftDeploymentDotNetReleasesVersion>$(MicrosoftDeploymentDotNetReleasesPackageVersion)</MicrosoftDeploymentDotNetReleasesVersion>
     <MicrosoftDiaSymReaderVersion>$(MicrosoftDiaSymReaderPackageVersion)</MicrosoftDiaSymReaderVersion>
-    <MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
-    <MicrosoftDotNetBuildTasksInstallersVersion>$(MicrosoftDotNetBuildTasksInstallersPackageVersion)</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)</MicrosoftDotNetBuildTasksTemplatingVersion>
-    <MicrosoftDotNetBuildTasksWorkloadsVersion>$(MicrosoftDotNetBuildTasksWorkloadsPackageVersion)</MicrosoftDotNetBuildTasksWorkloadsVersion>
-    <MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>
-    <MicrosoftDotNetSignToolVersion>$(MicrosoftDotNetSignToolPackageVersion)</MicrosoftDotNetSignToolVersion>
     <MicrosoftDotNetWebItemTemplates100Version>$(MicrosoftDotNetWebItemTemplates100PackageVersion)</MicrosoftDotNetWebItemTemplates100Version>
     <MicrosoftDotNetWebProjectTemplates100Version>$(MicrosoftDotNetWebProjectTemplates100PackageVersion)</MicrosoftDotNetWebProjectTemplates100Version>
-    <MicrosoftDotNetXliffTasksVersion>$(MicrosoftDotNetXliffTasksPackageVersion)</MicrosoftDotNetXliffTasksVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>$(MicrosoftDotNetXUnitExtensionsPackageVersion)</MicrosoftDotNetXUnitExtensionsVersion>
     <MicrosoftExtensionsConfigurationIniVersion>$(MicrosoftExtensionsConfigurationIniPackageVersion)</MicrosoftExtensionsConfigurationIniVersion>
     <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
     <MicrosoftExtensionsFileProvidersAbstractionsVersion>$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)</MicrosoftExtensionsFileProvidersAbstractionsVersion>
@@ -213,7 +205,6 @@ This file should be imported by eng/Versions.props
     <MicrosoftNETHostModelVersion>$(MicrosoftNETHostModelPackageVersion)</MicrosoftNETHostModelVersion>
     <MicrosoftNETILLinkTasksVersion>$(MicrosoftNETILLinkTasksPackageVersion)</MicrosoftNETILLinkTasksVersion>
     <MicrosoftNETRuntimeEmscripten3156Cachewinx64Version>$(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion)</MicrosoftNETRuntimeEmscripten3156Cachewinx64Version>
-    <MicrosoftNETRuntimeEmscriptenSdkInternalVersion>$(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion)</MicrosoftNETRuntimeEmscriptenSdkInternalVersion>
     <MicrosoftNETSdkRazorSourceGeneratorsTransportVersion>$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)</MicrosoftNETSdkRazorSourceGeneratorsTransportVersion>
     <MicrosoftNETSdkWindowsDesktopVersion>$(MicrosoftNETSdkWindowsDesktopPackageVersion)</MicrosoftNETSdkWindowsDesktopVersion>
     <MicrosoftNETTestSdkVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftNETTestSdkVersion>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -38,14 +38,14 @@
     <VersionFeature60>36</VersionFeature60>
     <VersionFeature70>20</VersionFeature70>
     <!-- This version should be N-1 (ie the currently released version) in the preview branch but N-2 in main so that workloads stay behind the unreleased version -->
-    <VersionFeature80>19</VersionFeature80>
-    <VersionFeature90>8</VersionFeature90>
+    <VersionFeature80>21</VersionFeature80>
+    <VersionFeature90>10</VersionFeature90>
     <!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
          referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
     <_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
     <!-- workload-specific version information -->
-    <VersionFeature80ForWorkloads>$([MSBuild]::Add($(VersionFeature80), 1))</VersionFeature80ForWorkloads>
-    <VersionFeature90ForWorkloads>$([MSBuild]::Add($(VersionFeature90), 1))</VersionFeature90ForWorkloads>
+    <VersionFeature80ForWorkloads>$(VersionFeature80)</VersionFeature80ForWorkloads>
+    <VersionFeature90ForWorkloads>$(VersionFeature90)</VersionFeature90ForWorkloads>
   </PropertyGroup>
   <PropertyGroup Label="Restore feeds">
     <!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
@@ -142,13 +142,13 @@
     <BenchmarkDotNetPackageVersion>0.14.0</BenchmarkDotNetPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Workload manifest package versions">
-    <MauiFeatureBand>10.0.100-preview.6</MauiFeatureBand>
-    <MauiWorkloadManifestVersion>10.0.0-preview.6.25359.8</MauiWorkloadManifestVersion>
-    <XamarinAndroidWorkloadManifestVersion>36.0.0-preview.6.169</XamarinAndroidWorkloadManifestVersion>
-    <XamarinIOSWorkloadManifestVersion>18.5.10415-net10-p6</XamarinIOSWorkloadManifestVersion>
-    <XamarinMacCatalystWorkloadManifestVersion>18.5.10415-net10-p6</XamarinMacCatalystWorkloadManifestVersion>
-    <XamarinMacOSWorkloadManifestVersion>15.5.10415-net10-p6</XamarinMacOSWorkloadManifestVersion>
-    <XamarinTvOSWorkloadManifestVersion>18.5.10415-net10-p6</XamarinTvOSWorkloadManifestVersion>
+    <MauiFeatureBand>10.0.100-rc.2</MauiFeatureBand>
+    <MauiWorkloadManifestVersion>10.0.0-rc.2.25504.7</MauiWorkloadManifestVersion>
+    <XamarinAndroidWorkloadManifestVersion>36.0.0-rc.2.332</XamarinAndroidWorkloadManifestVersion>
+    <XamarinIOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinIOSWorkloadManifestVersion>
+    <XamarinMacCatalystWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinMacCatalystWorkloadManifestVersion>
+    <XamarinMacOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinMacOSWorkloadManifestVersion>
+    <XamarinTvOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinTvOSWorkloadManifestVersion>
   </PropertyGroup>
   <PropertyGroup Label="Pinned dependency">
     <!-- This package is not being produced outside of the 2.0 branch of corefx and should not change. -->

diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml
@@ -24,14 +24,16 @@ parameters:
 steps:
   - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
     - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
-      # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
+      # Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
       - task: UseDotNet@2
         displayName: Install .NET 8.0 SDK for MicroBuild Plugin
         inputs:
           packageType: sdk
           version: 8.0.x
-          installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
-          workingDirectory: ${{ parameters.microBuildOutputFolder }}
+          # Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
+          # See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
+          # Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
+          installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
         condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
 
     - script: |

diff --git a/sdk.slnx b/sdk.slnx
@@ -49,13 +49,17 @@
     <Project Path="src/BuiltInTools/DotNetWatchTasks/DotNetWatchTasks.csproj" />
     <Project Path="src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.Package.csproj" />
     <Project Path="src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj" />
+    <Project Path="src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj" />
+    <Project Path="src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.shproj" />
     <Project Path="src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj" />
     <Project Path="src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj" />
     <Project Path="src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj" />
     <Project Path="src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj" />
     <Project Path="src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj" />
     <Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.Package.csproj" />
-    <Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.shproj" Id="a78ff92a-d715-4249-9e3d-40d9997a098f" />
+    <Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.shproj" />
+    <Project Path="src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj" />
+    <Project Path="src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.shproj" />
   </Folder>
   <Folder Name="/src/Cli/">
     <Project Path="src/Cli/dotnet/dotnet.csproj" />

@@ -5,23 +5,13 @@
       When updating the TFM also update minimal supported version in dotnet-watch.csproj and WebApplicationAppModel.cs.
     -->
     <TargetFramework>net6.0</TargetFramework>
-    <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
-
-    <!-- NuGet -->
-    <IsPackable>true</IsPackable>
-    <IsShipping>true</IsShipping>
-    <IsShippingPackage>true</IsShippingPackage>
-    <PackageId>Microsoft.DotNet.HotReload.Web.Middleware</PackageId>
-    <PackageDescription>Package containing Hot Reload middleware.</PackageDescription>
     <DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>
+
+    <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
   </PropertyGroup>
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <EmbeddedResource Include="WebSocketScriptInjection.js" />
-
-    <!-- Back compat only -->
-    <EmbeddedResource Include="BlazorHotReload.js" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
@@ -34,4 +24,5 @@
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Watch.BrowserRefresh.Tests" />
   </ItemGroup>
 
+  <Import Project="..\Web.Middleware\Microsoft.DotNet.HotReload.Web.Middleware.projitems" Label="Shared" />
 </Project>