diff --git a/NuGet.config b/NuGet.config index 14422e84291..3d164f7a341 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 3d9b4c549f8..7add30be82b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,18 +6,18 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.26257.101 - 10.0.0-beta.26257.101 - 10.0.0-beta.26257.101 - 10.0.0-beta.26257.101 - 10.0.0-beta.26257.101 - 10.0.0-beta.26257.101 - 10.0.0-beta.26257.101 + 10.0.0-beta.26270.134 + 10.0.0-beta.26270.134 + 10.0.0-beta.26270.134 + 10.0.0-beta.26270.134 + 10.0.0-beta.26270.134 + 10.0.0-beta.26270.134 + 10.0.0-beta.26270.134 10.0.9 10.0.9 10.0.9 10.0.9 - 10.0.9-servicing.26257.101 + 10.0.9-servicing.26270.134 10.0.9 10.0.9 10.0.9 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4eb5bbe56dc..0ca5c295448 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p And you can check these with "darc get-dependencies target-repo "winforms" --> - + - + https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 - + https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 - + https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 - + https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 - + https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 - + https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 - + https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 - + https://github.com/dotnet/dotnet - dc6e7082d768b79e69b16e8fd146a509dfa6130d + f7a0202521a5bba40862d5999d43aedf45a65ab3 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index e3374310563..a5be41db690 100644 --- a/eng/common/darc-init.ps1 +++ b/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" } } diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index e889f439b8d..e6ba4ee28c1 100755 --- a/eng/common/darc-init.sh +++ b/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 } diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1 index 472d5bb562c..c1e4104b79a 100644 --- a/eng/common/post-build/redact-logs.ps1 +++ b/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 diff --git a/global.json b/global.json index 205ad96fb6f..9b5267ba44c 100644 --- a/global.json +++ b/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": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,9 +21,9 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26257.101", - "Microsoft.DotNet.CMake.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.CMake.Sdk": "10.0.0-beta.26270.134", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26270.134", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "10.0.9" },