Skip to content

Commit fec96f2

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20200811.8 (#24961)
[master] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20403.5 to 5.0.0-beta.20411.8 - Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20403.5 to 5.0.0-beta.20411.8
1 parent cfe158c commit fec96f2

File tree

5 files changed

+45
-8
lines changed

5 files changed

+45
-8
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,13 +305,13 @@
305305
<Uri>https://github.com/dotnet/runtime</Uri>
306306
<Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
307307
</Dependency>
308-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20403.5">
308+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20411.8">
309309
<Uri>https://github.com/dotnet/arcade</Uri>
310-
<Sha>7385e2722b9fa517314aa5db1fa598a8d417b3c7</Sha>
310+
<Sha>ecec08a0eebbd92bb9538e351d475582551d9092</Sha>
311311
</Dependency>
312-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20403.5">
312+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20411.8">
313313
<Uri>https://github.com/dotnet/arcade</Uri>
314-
<Sha>7385e2722b9fa517314aa5db1fa598a8d417b3c7</Sha>
314+
<Sha>ecec08a0eebbd92bb9538e351d475582551d9092</Sha>
315315
</Dependency>
316316
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-2.20407.3">
317317
<Uri>https://github.com/dotnet/roslyn</Uri>

eng/common/SetupNugetSources.ps1

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
1212
# from the AzureDevOps-Artifact-Feeds-Pats variable group.
1313
#
14+
# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing
15+
#
1416
# - task: PowerShell@2
1517
# displayName: Setup Private Feeds Credentials
1618
# condition: eq(variables['Agent.OS'], 'Windows_NT')
@@ -94,6 +96,14 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
9496
}
9597
}
9698

99+
function EnablePrivatePackageSources($DisabledPackageSources) {
100+
$maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
101+
ForEach ($DisabledPackageSource in $maestroPrivateSources) {
102+
Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled"
103+
$DisabledPackageSource.SetAttribute("value", "false")
104+
}
105+
}
106+
97107
if (!(Test-Path $ConfigFile -PathType Leaf)) {
98108
Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile"
99109
ExitWithExitCode 1
@@ -123,6 +133,13 @@ if ($creds -eq $null) {
123133
$doc.DocumentElement.AppendChild($creds) | Out-Null
124134
}
125135

136+
# Check for disabledPackageSources; we'll enable any darc-int ones we find there
137+
$disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources")
138+
if ($disabledSources -ne $null) {
139+
Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node"
140+
EnablePrivatePackageSources -DisabledPackageSources $disabledSources
141+
}
142+
126143
$userName = "dn-bot"
127144

128145
# Insert credential nodes for Maestro's private feeds

eng/common/SetupNugetSources.sh

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
1414
# from the AzureDevOps-Artifact-Feeds-Pats variable group.
1515
#
16+
# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing.
17+
#
1618
# - task: Bash@3
1719
# displayName: Setup Private Feeds Credentials
1820
# inputs:
@@ -63,7 +65,7 @@ if [ "$?" != "0" ]; then
6365
ConfigNodeHeader="<configuration>"
6466
PackageSourcesTemplate="${TB}<packageSources>${NL}${TB}</packageSources>"
6567

66-
sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config
68+
sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
6769
fi
6870

6971
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
@@ -74,7 +76,7 @@ if [ "$?" != "0" ]; then
7476
PackageSourcesNodeFooter="</packageSources>"
7577
PackageSourceCredentialsTemplate="${TB}<packageSourceCredentials>${NL}${TB}</packageSourceCredentials>"
7678

77-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config
79+
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile
7880
fi
7981

8082
PackageSources=()
@@ -146,3 +148,20 @@ for FeedName in ${PackageSources[@]} ; do
146148
sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile
147149
fi
148150
done
151+
152+
# Re-enable any entries in disabledPackageSources where the feed name contains darc-int
153+
grep -i "<disabledPackageSources>" $ConfigFile
154+
if [ "$?" == "0" ]; then
155+
DisabledDarcIntSources=()
156+
echo "Re-enabling any disabled \"darc-int\" package sources in $ConfigFile"
157+
DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' $ConfigFile | tr -d '"')
158+
for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do
159+
if [[ $DisabledSourceName == darc-int* ]]
160+
then
161+
OldDisableValue="add key=\"$DisabledSourceName\" value=\"true\""
162+
NewDisableValue="add key=\"$DisabledSourceName\" value=\"false\""
163+
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile
164+
echo "Neutralized disablePackageSources entry for '$DisabledSourceName'"
165+
fi
166+
done
167+
fi

eng/common/sdk-task.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ function Build([string]$target) {
4242
/p:Configuration=$configuration `
4343
/p:RepoRoot=$RepoRoot `
4444
/p:BaseIntermediateOutputPath=$outputPath `
45+
/v:$verbosity `
4546
@properties
4647
}
4748

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.15.2",
33-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20403.5",
34-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20403.5"
33+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20411.8",
34+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20411.8"
3535
}
3636
}

0 commit comments

Comments
 (0)