diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 973d4c2d..68068582 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf + a9a80fb35d2e7da21509441d665a40022ce8f1b4 - + https://github.com/dotnet/arcade - 7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf + a9a80fb35d2e7da21509441d665a40022ce8f1b4 - + https://github.com/dotnet/arcade - 7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf + a9a80fb35d2e7da21509441d665a40022ce8f1b4 - + https://github.com/dotnet/arcade - 7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf + a9a80fb35d2e7da21509441d665a40022ce8f1b4 - + https://github.com/dotnet/arcade - 7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf + a9a80fb35d2e7da21509441d665a40022ce8f1b4 https://github.com/dotnet/arcade-services diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index bb361713..a0b5fc37 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -99,8 +99,9 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw function EnablePrivatePackageSources($DisabledPackageSources) { $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") ForEach ($DisabledPackageSource in $maestroPrivateSources) { - Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled" - $DisabledPackageSource.SetAttribute("value", "false") + Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" + # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries + $DisabledPackageSources.RemoveChild($DisabledPackageSource) } } diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index ef333829..2734601c 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -158,8 +158,8 @@ if [ "$?" == "0" ]; then for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do if [[ $DisabledSourceName == darc-int* ]] then - OldDisableValue="add key=\"$DisabledSourceName\" value=\"true\"" - NewDisableValue="add key=\"$DisabledSourceName\" value=\"false\"" + OldDisableValue="" + NewDisableValue="" sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile echo "Neutralized disablePackageSources entry for '$DisabledSourceName'" fi diff --git a/global.json b/global.json index 73160783..38c5c097 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20566.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20567.7" } }