diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b38c0bc1bf..f0fcc15d641 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -157,25 +157,25 @@ - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 https://github.com/dotnet/arcade f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index 127d9536553..a6c3af90c63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,7 +49,7 @@ 9.0.0-beta.24053.1 - 9.0.0-beta.24306.4 + 9.0.0-beta.24311.10 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index d6a39e31cc3..8bc107fa738 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -43,7 +43,7 @@ try { --azdev-pat $AzdoToken ` --bar-uri $MaestroApiEndPoint ` --password $MaestroToken ` - --disable-interactive-auth ` + --ci ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 0febe696dbd..9574f4eb9df 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -653,7 +653,7 @@ function GetNuGetPackageCachePath() { $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\' } else { $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\' - $env:RESTORENOCACHE = $true + $env:RESTORENOHTTPCACHE = $true } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index a4f5d1b7761..00473c9f918 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -347,14 +347,14 @@ function InitializeBuildTool { fi } -# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 +# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116 function GetNuGetPackageCachePath { if [[ -z ${NUGET_PACKAGES:-} ]]; then if [[ "$use_global_nuget_cache" == true ]]; then - export NUGET_PACKAGES="$HOME/.nuget/packages" + export NUGET_PACKAGES="$HOME/.nuget/packages/" else - export NUGET_PACKAGES="$repo_root/.packages" - export RESTORENOCACHE=true + export NUGET_PACKAGES="$repo_root/.packages/" + export RESTORENOHTTPCACHE=true fi fi diff --git a/global.json b/global.json index ed705f331cf..41dcd4b6490 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24306.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24306.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.10", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24311.10" }, "sdk": { "version": "9.0.100-preview.4.24267.66"