Update dependencies from https://github.com/dotnet/arcade build 20200807.3 (#8131)
[master] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20403.5 to 5.0.0-beta.20407.3
This commit is contained in:
parent
b21096b25a
commit
1e02070797
4 changed files with 41 additions and 5 deletions
|
@ -104,9 +104,9 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20403.5">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20407.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>7385e2722b9fa517314aa5db1fa598a8d417b3c7</Sha>
|
<Sha>ea8f37e8982dc22022b33c5e151081ad04d923a6</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
</Dependencies>
|
</Dependencies>
|
||||||
|
|
|
@ -11,6 +11,8 @@
|
||||||
# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
|
# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
|
||||||
# from the AzureDevOps-Artifact-Feeds-Pats variable group.
|
# from the AzureDevOps-Artifact-Feeds-Pats variable group.
|
||||||
#
|
#
|
||||||
|
# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing
|
||||||
|
#
|
||||||
# - task: PowerShell@2
|
# - task: PowerShell@2
|
||||||
# displayName: Setup Private Feeds Credentials
|
# displayName: Setup Private Feeds Credentials
|
||||||
# condition: eq(variables['Agent.OS'], 'Windows_NT')
|
# condition: eq(variables['Agent.OS'], 'Windows_NT')
|
||||||
|
@ -94,6 +96,14 @@ 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")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!(Test-Path $ConfigFile -PathType Leaf)) {
|
if (!(Test-Path $ConfigFile -PathType Leaf)) {
|
||||||
Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile"
|
Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile"
|
||||||
ExitWithExitCode 1
|
ExitWithExitCode 1
|
||||||
|
@ -123,6 +133,13 @@ if ($creds -eq $null) {
|
||||||
$doc.DocumentElement.AppendChild($creds) | Out-Null
|
$doc.DocumentElement.AppendChild($creds) | Out-Null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Check for disabledPackageSources; we'll enable any darc-int ones we find there
|
||||||
|
$disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources")
|
||||||
|
if ($disabledSources -ne $null) {
|
||||||
|
Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node"
|
||||||
|
EnablePrivatePackageSources -DisabledPackageSources $disabledSources
|
||||||
|
}
|
||||||
|
|
||||||
$userName = "dn-bot"
|
$userName = "dn-bot"
|
||||||
|
|
||||||
# Insert credential nodes for Maestro's private feeds
|
# Insert credential nodes for Maestro's private feeds
|
||||||
|
|
|
@ -13,6 +13,8 @@
|
||||||
# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
|
# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
|
||||||
# from the AzureDevOps-Artifact-Feeds-Pats variable group.
|
# from the AzureDevOps-Artifact-Feeds-Pats variable group.
|
||||||
#
|
#
|
||||||
|
# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing.
|
||||||
|
#
|
||||||
# - task: Bash@3
|
# - task: Bash@3
|
||||||
# displayName: Setup Private Feeds Credentials
|
# displayName: Setup Private Feeds Credentials
|
||||||
# inputs:
|
# inputs:
|
||||||
|
@ -63,7 +65,7 @@ if [ "$?" != "0" ]; then
|
||||||
ConfigNodeHeader="<configuration>"
|
ConfigNodeHeader="<configuration>"
|
||||||
PackageSourcesTemplate="${TB}<packageSources>${NL}${TB}</packageSources>"
|
PackageSourcesTemplate="${TB}<packageSources>${NL}${TB}</packageSources>"
|
||||||
|
|
||||||
sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config
|
sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
|
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
|
||||||
|
@ -74,7 +76,7 @@ if [ "$?" != "0" ]; then
|
||||||
PackageSourcesNodeFooter="</packageSources>"
|
PackageSourcesNodeFooter="</packageSources>"
|
||||||
PackageSourceCredentialsTemplate="${TB}<packageSourceCredentials>${NL}${TB}</packageSourceCredentials>"
|
PackageSourceCredentialsTemplate="${TB}<packageSourceCredentials>${NL}${TB}</packageSourceCredentials>"
|
||||||
|
|
||||||
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config
|
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PackageSources=()
|
PackageSources=()
|
||||||
|
@ -146,3 +148,20 @@ for FeedName in ${PackageSources[@]} ; do
|
||||||
sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile
|
sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Re-enable any entries in disabledPackageSources where the feed name contains darc-int
|
||||||
|
grep -i "<disabledPackageSources>" $ConfigFile
|
||||||
|
if [ "$?" == "0" ]; then
|
||||||
|
DisabledDarcIntSources=()
|
||||||
|
echo "Re-enabling any disabled \"darc-int\" package sources in $ConfigFile"
|
||||||
|
DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' $ConfigFile | tr -d '"')
|
||||||
|
for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do
|
||||||
|
if [[ $DisabledSourceName == darc-int* ]]
|
||||||
|
then
|
||||||
|
OldDisableValue="add key=\"$DisabledSourceName\" value=\"true\""
|
||||||
|
NewDisableValue="add key=\"$DisabledSourceName\" value=\"false\""
|
||||||
|
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile
|
||||||
|
echo "Neutralized disablePackageSources entry for '$DisabledSourceName'"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
|
@ -8,6 +8,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20403.5"
|
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20407.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue