[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-dc6e708" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-dc6e7082/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-dotnet-d4d18f3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-d4d18f3a/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.26257.101</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.26257.101</MicrosoftDotNetCodeAnalysisPackageVersion>
-    <MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.26257.101</MicrosoftDotNetGenAPIPackageVersion>
-    <MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26257.101</MicrosoftDotNetHelixSdkPackageVersion>
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.9-servicing.26257.101</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26272.117</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.26272.117</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.26272.117</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26272.117</MicrosoftDotNetHelixSdkPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.9-servicing.26272.117</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>10.0.9</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCorePlatformsPackageVersion>10.0.9-servicing.26257.101</MicrosoftNETCorePlatformsPackageVersion>
-    <MicrosoftPrivateWinformsPackageVersion>10.0.9-servicing.26257.101</MicrosoftPrivateWinformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>10.0.9-servicing.26272.117</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftPrivateWinformsPackageVersion>10.0.9-servicing.26272.117</MicrosoftPrivateWinformsPackageVersion>
     <MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
     <MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
     <SystemCodeDomPackageVersion>10.0.9</SystemCodeDomPackageVersion>
@@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props
     <SystemDrawingCommonPackageVersion>10.0.9</SystemDrawingCommonPackageVersion>
     <SystemFormatsNrbfPackageVersion>10.0.9</SystemFormatsNrbfPackageVersion>
     <SystemIOPackagingPackageVersion>10.0.9</SystemIOPackagingPackageVersion>
-    <SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.9-servicing.26257.101</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
+    <SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.9-servicing.26272.117</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
     <SystemReflectionMetadataLoadContextPackageVersion>10.0.9</SystemReflectionMetadataLoadContextPackageVersion>
     <SystemResourcesExtensionsPackageVersion>10.0.9</SystemResourcesExtensionsPackageVersion>
     <SystemRuntimeSerializationFormattersPackageVersion>10.0.9</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="dc6e7082d768b79e69b16e8fd146a509dfa6130d" BarId="313473" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="d4d18f3a6b721b12a0589b26db5b9226f18447a1" BarId="315592" />
   <ProductDependencies>
-    <Dependency Name="Microsoft.Private.Winforms" Version="10.0.9-servicing.26257.101">
+    <Dependency Name="Microsoft.Private.Winforms" Version="10.0.9-servicing.26272.117">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.9-servicing.26257.101">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.9-servicing.26272.117">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="System.Windows.Extensions" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.9-servicing.26257.101">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.9-servicing.26272.117">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.5-servicing.26253.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
       <Sha>02c06974071d84bc2ea31864821c8fe345000bf1</Sha>
     </Dependency>
     <Dependency Name="System.Resources.Extensions" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="System.CodeDom" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="System.Diagnostics.EventLog" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="System.DirectoryServices" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="System.Formats.Nrbf" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="System.IO.Packaging" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="System.Security.Cryptography.Xml" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="System.Security.Permissions" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
     <Dependency Name="System.Drawing.Common" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</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.9-servicing.26257.101">
+    <Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.9-servicing.26272.117">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26257.101">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26272.117">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26257.101">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26272.117">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26257.101">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26272.117">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.26257.101">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.26272.117">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</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/source-index-stage1-publish.yml

@@ -14,8 +14,8 @@ steps:
     workingDirectory: $(Agent.TempDirectory)
 
 - script: |
-    $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
-    $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
+    $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
+    $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
   displayName: "Source Index: Download netsourceindex Tools"
   # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
   workingDirectory: $(Agent.TempDirectory)

eng/common/darc-init.ps1

@@ -29,11 +29,11 @@ function InstallDarcCli ($darcVersion, $toolpath) {
   Write-Host "Installing Darc CLI version $darcVersion..."
   Write-Host 'You may need to restart your command window if this is the first dotnet tool you have installed.'
   if (-not $toolpath) {
-    Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g"
-    & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g
+    Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --source '$arcadeServicesSource' -v $verbosity -g"
+    & "$dotnet" tool install $darcCliPackageName --version $darcVersion --source "$arcadeServicesSource" -v $verbosity -g
   }else {
-    Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity --tool-path '$toolpath'"
-    & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath"
+    Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --source '$arcadeServicesSource' -v $verbosity --tool-path '$toolpath'"
+    & "$dotnet" tool install $darcCliPackageName --version $darcVersion --source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath"
   }
 }
 

eng/common/darc-init.sh

@@ -73,9 +73,9 @@ function InstallDarcCli {
   echo "Installing Darc CLI version $darcVersion..."
   echo "You may need to restart your command shell if this is the first dotnet tool you have installed."
   if [ -z "$toolpath" ]; then
-    echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g)
+    echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --source "$arcadeServicesSource" -v $verbosity -g)
   else
-    echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath")
+    echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath")
   fi
 }
 

eng/common/post-build/redact-logs.ps1

@@ -48,8 +48,8 @@ try {
     Write-Host "Installing Binlog redactor CLI..."
     Write-Host "'$dotnet' new tool-manifest"
     & "$dotnet" new tool-manifest
-    Write-Host "'$dotnet' tool install $packageName --local --add-source '$PackageFeed' -v $verbosity --version $BinlogToolVersion"
-    & "$dotnet" tool install $packageName --local --add-source "$PackageFeed" -v $verbosity --version $BinlogToolVersion
+    Write-Host "'$dotnet' tool install $packageName --local --source '$PackageFeed' -v $verbosity --version $BinlogToolVersion"
+    & "$dotnet" tool install $packageName --local --source "$PackageFeed" -v $verbosity --version $BinlogToolVersion
 
     if (Test-Path $TokensFilePath) {
         Write-Host "Adding additional sensitive data for redaction from file: " $TokensFilePath

eng/common/templates/steps/vmr-sync.yml

@@ -45,11 +45,11 @@ steps:
   workingDirectory: ${{ parameters.vmrPath }}
 
 - script: |
-    ./eng/common/vmr-sync.sh                         \
-      --vmr ${{ parameters.vmrPath }}         \
-      --tmp $(Agent.TempDirectory)            \
-      --azdev-pat '$(dn-bot-all-orgs-code-r)' \
-      --ci                                    \
+    ./eng/common/vmr-sync.sh          \
+      --vmr ${{ parameters.vmrPath }} \
+      --tmp $(Agent.TempDirectory)    \
+      --azdev-pat '$(AzdoToken)'      \
+      --ci                            \
       --debug
 
     if [ "$?" -ne 0 ]; then
@@ -67,11 +67,11 @@ steps:
   condition: eq(variables['Agent.OS'], 'Windows_NT')
 
 - powershell: |
-    ./eng/common/vmr-sync.ps1                      `
-      -vmr ${{ parameters.vmrPath }}        `
-      -tmp $(Agent.TempDirectory)           `
-      -azdevPat '$(dn-bot-all-orgs-code-r)' `
-      -ci                                   `
+    ./eng/common/vmr-sync.ps1        `
+      -vmr ${{ parameters.vmrPath }} `
+      -tmp $(Agent.TempDirectory)    `
+      -azdevPat '$(AzdoToken)'       `
+      -ci                            `
       -debugOutput
 
     if ($LASTEXITCODE -ne 0) {

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.107",
+    "version": "10.0.108",
     "allowPrerelease": true,
     "rollForward": "latestFeature",
     "paths": [
@@ -10,7 +10,7 @@
     "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
   },
   "tools": {
-    "dotnet": "10.0.107",
+    "dotnet": "10.0.108",
     "runtimes": {
       "dotnet/x64": [
         "$(MicrosoftNETCorePlatformsVersion)"
@@ -24,8 +24,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26257.101",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26257.101",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26272.117",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26272.117",
     "Microsoft.Build.NoTargets": "3.7.56"
   },
   "native-tools": {