Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20201117.7 (#805)

[master] Update dependencies from dotnet/arcade
finitereality/replica-status-colors
dotnet-maestro[bot] 6 years ago
committed by GitHub
parent
commit
f192e59df9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      eng/Version.Details.xml
  2. 5
      eng/common/SetupNugetSources.ps1
  3. 4
      eng/common/SetupNugetSources.sh
  4. 2
      global.json

20
eng/Version.Details.xml

@ -3,25 +3,25 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20566.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20567.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf</Sha>
<Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20566.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20567.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf</Sha>
<Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.20566.3">
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.20567.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf</Sha>
<Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20566.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20567.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf</Sha>
<Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.20566.3">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.20567.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf</Sha>
<Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri>

5
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)
}
}

4
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="<add key=\"$DisabledSourceName\" value=\"true\" />"
NewDisableValue="<!-- Reenabled for build : $DisabledSourceName -->"
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile
echo "Neutralized disablePackageSources entry for '$DisabledSourceName'"
fi

2
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"
}
}

Loading…
Cancel
Save