Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit cf63269

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20201119.8 (#13652)
[release/3.1.4xx] Update dependencies from dotnet/arcade
1 parent 12548f9 commit cf63269

File tree

6 files changed

+9
-10
lines changed

6 files changed

+9
-10
lines changed

NuGet.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
<add key="darc-pub-dotnet-core-setup-7fe019d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-7fe019d8/nuget/v3/index.json" />
99
<!-- End: Package sources from dotnet-core-setup -->
1010
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
11-
<!-- Begin: Package sources from dotnet-core-setup -->
12-
<!-- End: Package sources from dotnet-core-setup -->
1311
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1412
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
1513
<add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
</Dependency>
4343
</ProductDependencies>
4444
<ToolsetDependencies>
45-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20509.7">
45+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20569.8">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>e4584b56c5334067d30a04dd6b2d1d724ed7ccc3</Sha>
47+
<Sha>c8e0cc19e7406ab0e2b2998b9c7a9249ef801b19</Sha>
4848
</Dependency>
4949
</ToolsetDependencies>
5050
<ProductDependencies>

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
@@ -159,8 +159,8 @@ if [ "$?" == "0" ]; then
159159
for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do
160160
if [[ $DisabledSourceName == darc-int* ]]
161161
then
162-
OldDisableValue="add key=\"$DisabledSourceName\" value=\"true\""
163-
NewDisableValue="add key=\"$DisabledSourceName\" value=\"false\""
162+
OldDisableValue="<add key=\"$DisabledSourceName\" value=\"true\" />"
163+
NewDisableValue="<!-- Reenabled for build : $DisabledSourceName -->"
164164
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile
165165
echo "Neutralized disablePackageSources entry for '$DisabledSourceName'"
166166
fi

eng/common/templates/post-build/post-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
enableSourceLinkValidation: false
3-
enableSigningValidation: true
3+
enableSigningValidation: false
44
enableSymbolValidation: false
55
enableNugetValidation: true
66
publishInstallersAndChecksums: false

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": "1.0.0-beta.20509.7"
11+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20569.8"
1212
}
1313
}

0 commit comments

Comments
 (0)