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

NuGet.config

@@ -4,7 +4,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-f7a0202" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-f7a02025/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->

eng/Version.Details.props

@@ -6,20 +6,20 @@ This file should be imported by eng/Versions.props
 <Project>
   <PropertyGroup>
     <!-- dotnet-dotnet dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26257.101</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26257.101</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
-    <MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26257.101</MicrosoftDotNetHelixSdkPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26270.134</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26270.134</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
+    <MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26270.134</MicrosoftDotNetHelixSdkPackageVersion>
     <MicrosoftExtensionsCachingMemoryPackageVersion>10.0.9</MicrosoftExtensionsCachingMemoryPackageVersion>
     <MicrosoftExtensionsConfigurationPackageVersion>10.0.9</MicrosoftExtensionsConfigurationPackageVersion>
     <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.9</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
     <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.9</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
     <MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.9</MicrosoftExtensionsConfigurationJsonPackageVersion>
     <MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.9</MicrosoftExtensionsDependencyInjectionPackageVersion>
     <MicrosoftExtensionsDependencyModelPackageVersion>10.0.9</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.9-servicing.26257.101</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.9-servicing.26270.134</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
     <MicrosoftExtensionsLoggingPackageVersion>10.0.9</MicrosoftExtensionsLoggingPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>10.0.9</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCorePlatformsPackageVersion>10.0.9-servicing.26257.101</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>10.0.9-servicing.26270.134</MicrosoftNETCorePlatformsPackageVersion>
     <SystemFormatsAsn1PackageVersion>10.0.9</SystemFormatsAsn1PackageVersion>
     <SystemRuntimeCachingPackageVersion>10.0.9</SystemRuntimeCachingPackageVersion>
     <SystemTextEncodingsWebPackageVersion>10.0.9</SystemTextEncodingsWebPackageVersion>

eng/Version.Details.xml

@@ -1,80 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="dc6e7082d768b79e69b16e8fd146a509dfa6130d" BarId="313473" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="f7a0202521a5bba40862d5999d43aedf45a65ab3" BarId="315339" />
   <ProductDependencies>
     <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.9-servicing.26257.101">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.9-servicing.26270.134">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.9-servicing.26257.101">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.9-servicing.26270.134">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
     <Dependency Name="System.Text.Json" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
     <Dependency Name="System.Text.Encodings.Web" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
     <Dependency Name="System.Formats.Asn1" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
     <Dependency Name="System.Runtime.Caching" Version="10.0.9">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26257.101">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26270.134">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26257.101">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26270.134">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</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.26270.134">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>dc6e7082d768b79e69b16e8fd146a509dfa6130d</Sha>
+      <Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

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

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.107",
+    "version": "10.0.108",
     "allowPrerelease": true,
     "rollForward": "latestMajor",
     "paths": [
@@ -10,15 +10,15 @@
     "errorMessage": "The required .NET SDK wasn't found. Please run ./restore.sh or .\\restore.cmd to install it."
   },
   "tools": {
-    "dotnet": "10.0.107",
+    "dotnet": "10.0.108",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCorePlatformsVersion)"
       ]
     }
   },
   "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.26270.134",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26270.134"
   }
 }