Skip to content

Commit 9d3065e

Browse files
dotnet-maestro[bot]vlada-shubina
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20201119.13
Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20560.3 -> To Version 5.0.0-beta.20569.13
1 parent 820bab4 commit 9d3065e

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20560.3">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20569.13">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>6f54e001de0c52e52578e5252cb279f5bc9a2eb6</Sha>
8+
<Sha>772260960df1337d7448bcc97af1fced236eff63</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/common/SetupNugetSources.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,9 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
9999
function EnablePrivatePackageSources($DisabledPackageSources) {
100100
$maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
101101
ForEach ($DisabledPackageSource in $maestroPrivateSources) {
102-
Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled"
103-
$DisabledPackageSource.SetAttribute("value", "false")
102+
Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource"
103+
# Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries
104+
$DisabledPackageSources.RemoveChild($DisabledPackageSource)
104105
}
105106
}
106107

eng/common/SetupNugetSources.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ if [ "$?" == "0" ]; then
158158
for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do
159159
if [[ $DisabledSourceName == darc-int* ]]
160160
then
161-
OldDisableValue="add key=\"$DisabledSourceName\" value=\"true\""
162-
NewDisableValue="add key=\"$DisabledSourceName\" value=\"false\""
161+
OldDisableValue="<add key=\"$DisabledSourceName\" value=\"true\" />"
162+
NewDisableValue="<!-- Reenabled for build : $DisabledSourceName -->"
163163
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile
164164
echo "Neutralized disablePackageSources entry for '$DisabledSourceName'"
165165
fi

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
}
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20560.3"
11+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20569.13"
1212
}
1313
}

0 commit comments

Comments
 (0)