Merge branch 'main' into copilot/fix-61764-2

Author: captainsafia

.github/copilot-instructions.md

@@ -3,6 +3,8 @@
 * Make only high confidence suggestions when reviewing code changes.
 * Always use the latest version C#, currently C# 13 features.
 * Never change global.json unless explicitly asked to.
+* Never change package.json or package-lock.json files unless explicitly asked to.
+* Never change NuGet.config files unless explicitly asked to.
 
 ## Formatting
 
@@ -12,7 +14,7 @@
 * Ensure that the final return statement of a method is on its own line.
 * Use pattern matching and switch expressions wherever possible.
 * Use `nameof` instead of string literals when referring to member names.
-* Ensure that XML doc comments are created for any public APIs. When applicable, include <example> and <code> documentation in the comments.
+* Ensure that XML doc comments are created for any public APIs. When applicable, include `<example>` and `<code>` documentation in the comments.
 
 ### Nullable Reference Types
 

.github/policies/resourceManagement.yml

@@ -382,18 +382,18 @@ configuration:
           branch: main
       then:
       - addMilestone:
-          milestone: 10.0-preview5
+          milestone: 10.0-preview6
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/10.0-preview4
+          branch: release/10.0-preview5
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 10.0-preview4
+          milestone: 10.0-preview5
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
     - if:
       - payloadType: Issues

.github/workflows/backport.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@9bbce22e13f399ad3cb8b4b7e53960b621f92ea1 # 2025-01-13
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@080e393ba794356ef2b743cc89481774c4a26656 # 2025-01-13
     with:
       pr_description_template: |
         Backport of #%source_pr_number% to %target_branch%

.github/workflows/inter-branch-merge-flow.yml

@@ -10,4 +10,4 @@ permissions:
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@9bbce22e13f399ad3cb8b4b7e53960b621f92ea1 # 2024-06-24
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@080e393ba794356ef2b743cc89481774c4a26656 # 2024-06-24

docs/DailyBuilds.md

@@ -4,7 +4,7 @@ Daily builds include the latest source code changes. They are not supported for
 
 If you want to download the latest daily build and use it in a project, then you need to:
 
-* Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/sdk/blob/main/documentation/package-table.md).
+* Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/dotnet/blob/main/docs/builds-table.md).
 * Add a NuGet.Config to your project directory with the following content:
 
 ## .NET 8

eng/Build.props

@@ -56,14 +56,14 @@
                       $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj;
                       " />
 
-    <!-- In the VMR, we don't build the native ANCM bits in pass 1 -->
+    <!-- In the .NET product build mode, don't build the native ANCM bits in pass 1 -->
     <ProjectToExclude Include="
                       $(RepoRoot)src\Installers\**\*.vcxproj;
                       "
                       Condition=" '$(BuildNative)' == 'true' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " />
 
 
-    <!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the VMR, we build it in pass 2 -->
+    <!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the .NET product build mode, build it in pass 2 -->
     <ProjectToExclude Include="
                       $(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj;
                       "
@@ -83,7 +83,7 @@
         </ProjectToBuild>
       </ItemGroup>
     </When>
-    <!-- Projects to build in VMR build pass 2 -->
+    <!-- Projects to build in .NET product build pass 2 -->
     <When Condition="'$(DotNetBuildPass)' == '2'">
       <ItemGroup Condition=" '$(DotNetBuild)' == 'true' AND '$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64' ">
         <!-- Build Hosting Bundle -->
@@ -264,7 +264,7 @@
         <_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'arm64'">ARM64</_VcxTargetPlatform>
       </PropertyGroup>
 
-      <!-- In the VMR, we build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
+      <!-- In .NET product build mode, build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
       <ItemGroup Condition="'$(DotNetBuild)' != 'true' and '$(_BuildWindowsInstallers)' == 'true' ">
         <!-- Build the ANCM custom action -->
         <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=x64" />

eng/Common.props

@@ -11,7 +11,7 @@
 
     <TargetRuntimeIdentifier Condition="'$(TargetRuntimeIdentifier)' == ''">$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
     <PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
-    <DefaultAppHostRuntimeIdentifier Condition=" '$(DotNetBuild)' == 'true' ">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>
+    <DefaultAppHostRuntimeIdentifier Condition="'$(DotNetBuild)' == 'true'">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>
 
     <BuildNodeJS>$(BuildNodeJSUnlessSourcebuild)</BuildNodeJS>
     <BuildNodeJS Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</BuildNodeJS>

eng/Dependencies.props

@@ -258,4 +258,23 @@ and are generated based on the last package release.
           Condition=" $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Runtime.')) or $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Crossgen2.'))">$(MicrosoftNETCoreAppRefVersion)</Version>
     </LatestPackageReference>
   </ItemGroup>
+
+  <!-- Replicates the same overriding of versions that occurs on Roslyn package versions for source only builds -->
+  <ItemGroup Label="Source only build overrides" Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.Common">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.CSharp">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.Razor">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+  </ItemGroup>
 </Project>

eng/Publishing.props

@@ -1,15 +1,14 @@
 <Project>
+
   <PropertyGroup>
     <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
 
-    <!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows.
-         Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
-         the nupkgs pushed. Do not do this if building from source, since we want the source build intermediate package
-         to be published. Use DotNetBuildRepo is only set in the internal source build,
-         and Build.proj is invoked from the wrapper build. -->
+    <!-- Don't sign and publish rid agnostic nuget packages from other builds than windows when not building
+         inside the VMR. Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
+         the nupkgs pushed. -->
     <EnableDefaultArtifacts Condition="'$(OS)' != 'Windows_NT' and
                                        '$(PostBuildSign)' != 'true' and
-                                       '$(DotNetBuildRepo)' != 'true'">false</EnableDefaultArtifacts>
+                                       '$(DotNetBuild)' != 'true'">false</EnableDefaultArtifacts>
 
     <!-- This avoids creating VS.*.symbols.nupkg packages that are identical to the original package. -->
     <AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
@@ -63,7 +62,7 @@
                       Encoding="ASCII" />
 
     <ItemGroup>
-      <Artifact Include="@(ProductVersionFile)" Kind="Blob" UploadPathSegment="Runtime" />
+      <Artifact Include="@(ProductVersionFile)" Kind="Blob" UploadPathSegment="Runtime/" />
     </ItemGroup>
   </Target>
 

eng/SharedFramework.External.props

@@ -43,6 +43,7 @@
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options"                                 Version="$(MicrosoftExtensionsOptionsVersion)" />
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Primitives"                              Version="$(MicrosoftExtensionsPrimitivesVersion)" />
     <ExternalAspNetCoreAppReference Include="System.Security.Cryptography.Xml"                             Version="$(SystemSecurityCryptographyXmlVersion)" />
+    <ExternalAspNetCoreAppReference Include="System.Threading.AccessControl"                               Version="$(SystemThreadingAccessControlVersion)" />
     <ExternalAspNetCoreAppReference Include="System.Threading.RateLimiting"                                Version="$(SystemThreadingRateLimitingVersion)" />
 
     <!--