[release/10.0] Source code updates from dotnet/dotnet

NuGet.config

@@ -5,7 +5,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-dotnet -->
-    <add key="darc-pub-dotnet-dotnet-bbafab7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-bbafab7b/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-dotnet-ba86126" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-ba861262/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-dotnet -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

eng/Version.Details.props

@@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props
     <!-- dotnet/dotnet dependencies -->
     <MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
-    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetCodeAnalysisPackageVersion>
-    <MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetGenAPIPackageVersion>
-    <MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetHelixSdkPackageVersion>
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rtm.25528.106</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetHelixSdkPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rtm.25531.102</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25528.106</MicrosoftNETCorePlatformsPackageVersion>
-    <MicrosoftPrivateWinformsPackageVersion>10.0.0-rtm.25528.106</MicrosoftPrivateWinformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25531.102</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftPrivateWinformsPackageVersion>10.0.0-rtm.25531.102</MicrosoftPrivateWinformsPackageVersion>
     <MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
     <MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
     <SystemCodeDomPackageVersion>10.0.0</SystemCodeDomPackageVersion>
@@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props
     <SystemDrawingCommonPackageVersion>10.0.0</SystemDrawingCommonPackageVersion>
     <SystemFormatsNrbfPackageVersion>10.0.0</SystemFormatsNrbfPackageVersion>
     <SystemIOPackagingPackageVersion>10.0.0</SystemIOPackagingPackageVersion>
-    <SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rtm.25528.106</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
+    <SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rtm.25531.102</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
     <SystemReflectionMetadataLoadContextPackageVersion>10.0.0</SystemReflectionMetadataLoadContextPackageVersion>
     <SystemResourcesExtensionsPackageVersion>10.0.0</SystemResourcesExtensionsPackageVersion>
     <SystemRuntimeSerializationFormattersPackageVersion>10.0.0</SystemRuntimeSerializationFormattersPackageVersion>

eng/Version.Details.xml

@@ -1,78 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05" BarId="288919" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="ba86126261026d26f7c30cd3434680d3965a88cf" BarId="289152" />
   <ProductDependencies>
-    <Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rtm.25528.106">
+    <Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rtm.25531.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rtm.25528.106">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rtm.25531.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="System.Windows.Extensions" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25528.106">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25531.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rtm.25513.4">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
       <Sha>bbb14872ef0b8cdc8c2ebcd4f19f78024d5f560c</Sha>
     </Dependency>
     <Dependency Name="System.Resources.Extensions" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="System.CodeDom" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="System.Diagnostics.EventLog" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="System.DirectoryServices" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="System.Formats.Nrbf" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="System.IO.Packaging" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="System.Security.Permissions" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="System.Drawing.Common" Version="10.0.0">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
       <Uri>https://github.com/dotnet/dotnet</Uri>
@@ -84,25 +84,25 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rtm.25528.106">
+    <Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rtm.25531.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25528.106">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25531.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25528.106">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25531.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25528.106">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25531.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25528.106">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25531.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
+      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
     </Dependency>
     <!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
     <Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">

eng/common/core-templates/steps/install-microbuild.yml

@@ -11,23 +11,22 @@ parameters:
   # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
   # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
   microbuildUseESRP: true
-  # Location of the MicroBuild output folder
-  # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
-  microBuildOutputFolder: '$(Build.SourcesDirectory)'
 
   continueOnError: false
 
 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: |
@@ -65,7 +64,7 @@ steps:
             ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
       env:
         TeamName: $(_TeamName)
-        MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
+        MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
       continueOnError: ${{ parameters.continueOnError }}
       condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
@@ -85,7 +84,7 @@ steps:
               ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
         env:
           TeamName: $(_TeamName)
-          MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
+          MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
           SYSTEM_ACCESSTOKEN: $(System.AccessToken)
         continueOnError: ${{ parameters.continueOnError }}
         condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'),  eq(variables['_SignType'], 'real'))

global.json

@@ -24,8 +24,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25528.106",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25528.106",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25531.102",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25531.102",
     "Microsoft.Build.NoTargets": "3.7.56"
   },
   "native-tools": {