Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …

…merge/release/9.0.1xx-to-release/9.0.2xx
dotnet · Nov 20, 2024 · 1676070 · 1676070
2 parents 8e18c80 + 4f0bcf1
commit 1676070
Show file tree

Hide file tree

Showing 344 changed files with 6,317 additions and 3,977 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -5,7 +5,7 @@ trigger:
   branches:
     include:
     - main
-    - release/9.0.1xx
+    - release/9.0.2xx
     - internal/release/*
     - exp/*
 
@@ -97,7 +97,7 @@ extends:
         parameters:
           pool:
             name: $(DncEngInternalBuildPool)
-            image: 1es-windows-2022
+            image: windows.vs2022.amd64
             os: windows
           helixTargetQueue: windows.amd64.vs2022.pre
           oneESCompat:
@@ -291,6 +291,19 @@ extends:
               publishArgument: $(_publishArgument)
               officialBuildProperties: $(_officialBuildProperties)
               runTests: false
+      ### ARM64 TESTBUILD ###
+      - ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:
+        - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
+          parameters:
+            pool:
+              name: Azure Pipelines
+              vmImage: macOS-latest
+              os: macOS
+            helixTargetQueue: osx.13.arm64
+            macOSJobParameterSets:
+            - categoryName: TestBuild
+              buildArchitecture: arm64
+              runtimeIdentifier: osx-arm64
 
       ############### SOURCE BUILD ###############
       - template: /eng/common/templates-official/job/source-build.yml@self

diff --git a/.vsts-pr.yml b/.vsts-pr.yml
@@ -58,6 +58,18 @@ stages:
         vmImage: macOS-latest
         os: macOS
       helixTargetQueue: osx.13.amd64.open
+  ### ARM64 ###
+  - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
+    parameters:
+      pool:
+        name: Azure Pipelines
+        vmImage: macOS-latest
+        os: macOS
+      helixTargetQueue: osx.13.arm64.open
+      macOSJobParameterSets:
+      - categoryName: TestBuild
+        buildArchitecture: arm64
+        runtimeIdentifier: osx-arm64
 
   ############### SOURCE BUILD ###############
   - template: /eng/common/templates/job/source-build.yml

diff --git a/NuGet.config b/NuGet.config
@@ -5,21 +5,60 @@
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-aspire -->
     <!--  End: Package sources from dotnet-aspire -->
-    <!--  Begin: Package sources from dotnet-emsdk -->
-    <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-af22eff" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-9/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-8/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-7/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-6/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-12/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-11/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-10/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from dotnet-emsdk -->
+    <add key="darc-pub-dotnet-emsdk-763d10a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-763d10a-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-9/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-763d10a-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-763d10a-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-763d10a-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-763d10a-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-763d10a-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-763d10a-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-763d10a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-763d10a-12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-12/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-763d10a-11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-11/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-763d10a-10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-10/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-763d10a-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-1/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-43a2496" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-43a24969/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-9d5a6a9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9d5a6a9a/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-9d5a6a9-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9d5a6a9a-9/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-9d5a6a9-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9d5a6a9a-12/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-e660cd9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e660cd90/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-44a0b49" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-44a0b49c/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-44a0b49-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-44a0b49c-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-308dc79" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-9/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-8/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-7/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-6/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-12/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-11/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-10/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--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" />
@@ -46,10 +85,36 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-af22eff-10" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-11" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-12" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-4" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-5" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-6" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-7" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-8" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff-9" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-af22eff" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-9d5a6a9-12" value="true" />
+    <add key="darc-int-dotnet-runtime-9d5a6a9-9" value="true" />
+    <add key="darc-int-dotnet-runtime-9d5a6a9" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-10" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-11" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-12" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-2" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-3" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-4" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-5" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-6" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-7" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-8" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79-9" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-308dc79" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
@@ -37,6 +37,9 @@
     <UsagePattern IdentityGlob="System.Reflection.Metadata/8.0.0" />
     <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
 
+    <!-- Transitive dependencies from MSBuild -->
+	  <UsagePattern IdentityGlob="Microsoft.VisualStudio.SolutionPersistence/1.0.9" />
+
     <!-- Transitive dependencies from roslyn -->
     <UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0.0" />