Skip to content

Commit dfc8cf5

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20220728.5 (#43241)
[release/3.1] Update dependencies from dotnet/arcade
1 parent dc4c583 commit dfc8cf5

15 files changed

+120
-70
lines changed

‎NuGet.config

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-efcore -->
7-
<add key="darc-int-dotnet-efcore-99099dd" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-99099ddf/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-efcore -->
98
<!-- Begin: Package sources from dotnet-extensions -->
10-
<add key="darc-int-dotnet-extensions-bf06962" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-bf069624/nuget/v3/index.json" />
119
<!-- Begin: Package sources from dotnet-razor-tooling -->
12-
<add key="darc-int-dotnet-razor-tooling-9ca2e33" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-razor-tooling-9ca2e338/nuget/v3/index.json" />
1310
<!-- End: Package sources from dotnet-razor-tooling -->
1411
<!-- Begin: Package sources from dotnet-corefx -->
15-
<add key="darc-int-dotnet-corefx-e0e08bd" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-e0e08bd5/nuget/v3/index.json" />
1612
<!-- End: Package sources from dotnet-corefx -->
1713
<!-- Begin: Package sources from dotnet-core-setup -->
18-
<add key="darc-int-dotnet-core-setup-ce3350c" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-ce3350c1/nuget/v3/index.json" />
1914
<!-- End: Package sources from dotnet-core-setup -->
2015
<!-- End: Package sources from dotnet-extensions -->
2116
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -28,19 +23,14 @@
2823
<clear />
2924
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3025
<!-- Begin: Package sources from dotnet-core-setup -->
31-
<add key="darc-int-dotnet-core-setup-ce3350c" value="true" />
3226
<!-- Begin: Package sources from dotnet-efcore -->
33-
<add key="darc-int-dotnet-efcore-99099dd" value="true" />
3427
<!-- End: Package sources from dotnet-efcore -->
3528
<!-- Begin: Package sources from dotnet-extensions -->
36-
<add key="darc-int-dotnet-extensions-bf06962" value="true" />
3729
<!-- End: Package sources from dotnet-extensions -->
3830
<!-- Begin: Package sources from dotnet-razor-tooling -->
39-
<add key="darc-int-dotnet-razor-tooling-9ca2e33" value="true" />
4031
<!-- End: Package sources from dotnet-razor-tooling -->
4132
<!-- End: Package sources from dotnet-core-setup -->
4233
<!-- Begin: Package sources from dotnet-corefx -->
43-
<add key="darc-int-dotnet-corefx-e0e08bd" value="true" />
4434
<!-- End: Package sources from dotnet-corefx -->
4535
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4636
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,13 @@
418418
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
419419
<Sha>bf069624f8eb412724a7c2cade6e9f88f7107217</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22314.5">
421+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22378.5">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>fe57b3babcfc203dd61b7229b54d399b2e3f3c72</Sha>
423+
<Sha>0de02c603d72d93709a9c7f31d67289e8833b06a</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22314.5">
425+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22378.5">
426426
<Uri>https://github.com/dotnet/arcade</Uri>
427-
<Sha>fe57b3babcfc203dd61b7229b54d399b2e3f3c72</Sha>
427+
<Sha>0de02c603d72d93709a9c7f31d67289e8833b06a</Sha>
428428
</Dependency>
429429
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.28-servicing.22363.5" CoherentParentDependency="Microsoft.EntityFrameworkCore">
430430
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
-->
6565
<PropertyGroup Label="Automated">
6666
<!-- Packages from dotnet/arcade -->
67-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22314.5</MicrosoftDotNetGenAPIPackageVersion>
67+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22378.5</MicrosoftDotNetGenAPIPackageVersion>
6868
<!-- Packages from dotnet/roslyn -->
6969
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
7070
<!-- Packages from dotnet/core-setup -->

‎eng/common/init-tools-native.ps1

Lines changed: 82 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ Wait time between retry attempts in seconds
3131
.PARAMETER GlobalJsonFile
3232
File path to global.json file
3333
34+
.PARAMETER PathPromotion
35+
Optional switch to enable either promote native tools specified in the global.json to the path (in Azure Pipelines)
36+
or break the build if a native tool is not found on the path (on a local dev machine)
37+
3438
.NOTES
3539
#>
3640
[CmdletBinding(PositionalBinding=$false)]
@@ -41,7 +45,8 @@ Param (
4145
[switch] $Force = $False,
4246
[int] $DownloadRetries = 5,
4347
[int] $RetryWaitTimeInSeconds = 30,
44-
[string] $GlobalJsonFile
48+
[string] $GlobalJsonFile,
49+
[switch] $PathPromotion
4550
)
4651

4752
if (!$GlobalJsonFile) {
@@ -76,51 +81,88 @@ try {
7681
ConvertFrom-Json |
7782
Select-Object -Expand "native-tools" -ErrorAction SilentlyContinue
7883
if ($NativeTools) {
79-
$NativeTools.PSObject.Properties | ForEach-Object {
80-
$ToolName = $_.Name
81-
$ToolVersion = $_.Value
82-
$LocalInstallerArguments = @{ ToolName = "$ToolName" }
83-
$LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
84-
$LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
85-
$LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
86-
$LocalInstallerArguments += @{ Version = "$ToolVersion" }
87-
88-
if ($Verbose) {
89-
$LocalInstallerArguments += @{ Verbose = $True }
90-
}
91-
if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
92-
if($Force) {
93-
$LocalInstallerArguments += @{ Force = $True }
84+
if ($PathPromotion -eq $True) {
85+
if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build
86+
$NativeTools.PSObject.Properties | ForEach-Object {
87+
$ToolName = $_.Name
88+
$ToolVersion = $_.Value
89+
$InstalledTools = @{}
90+
91+
if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
92+
if ($ToolVersion -eq "latest") {
93+
$ToolVersion = ""
94+
}
95+
$ArcadeToolsDirectory = "C:\arcade-tools"
96+
if (-not (Test-Path $ArcadeToolsDirectory)) {
97+
Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
98+
exit 1
99+
}
100+
$ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0]
101+
if ([string]::IsNullOrWhiteSpace($ToolDirectory)) {
102+
Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image."
103+
exit 1
104+
}
105+
$BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
106+
if (-not (Test-Path -Path "$BinPathFile")) {
107+
Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."
108+
exit 1
109+
}
110+
$BinPath = Get-Content "$BinPathFile"
111+
$ToolPath = Convert-Path -Path $BinPath
112+
Write-Host "Adding $ToolName to the path ($ToolPath)..."
113+
Write-Host "##vso[task.prependpath]$ToolPath"
114+
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
115+
}
94116
}
95-
}
96-
if ($Clean) {
97-
$LocalInstallerArguments += @{ Clean = $True }
98-
}
99-
100-
Write-Verbose "Installing $ToolName version $ToolVersion"
101-
Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
102-
& $InstallerPath @LocalInstallerArguments
103-
if ($LASTEXITCODE -Ne "0") {
104-
$errMsg = "$ToolName installation failed"
105-
if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
106-
$showNativeToolsWarning = $true
107-
if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
108-
$showNativeToolsWarning = $false
117+
return $InstalledTools
118+
} else {
119+
$NativeTools.PSObject.Properties | ForEach-Object {
120+
$ToolName = $_.Name
121+
$ToolVersion = $_.Value
122+
$LocalInstallerArguments = @{ ToolName = "$ToolName" }
123+
$LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
124+
$LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
125+
$LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
126+
$LocalInstallerArguments += @{ Version = "$ToolVersion" }
127+
128+
if ($Verbose) {
129+
$LocalInstallerArguments += @{ Verbose = $True }
130+
}
131+
if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
132+
if($Force) {
133+
$LocalInstallerArguments += @{ Force = $True }
109134
}
110-
if ($showNativeToolsWarning) {
111-
Write-Warning $errMsg
135+
}
136+
if ($Clean) {
137+
$LocalInstallerArguments += @{ Clean = $True }
138+
}
139+
140+
Write-Verbose "Installing $ToolName version $ToolVersion"
141+
Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
142+
& $InstallerPath @LocalInstallerArguments
143+
if ($LASTEXITCODE -Ne "0") {
144+
$errMsg = "$ToolName installation failed"
145+
if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
146+
$showNativeToolsWarning = $true
147+
if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
148+
$showNativeToolsWarning = $false
149+
}
150+
if ($showNativeToolsWarning) {
151+
Write-Warning $errMsg
152+
}
153+
$toolInstallationFailure = $true
154+
} else {
155+
Write-Error $errMsg
156+
exit 1
112157
}
113-
$toolInstallationFailure = $true
114-
} else {
115-
Write-Error $errMsg
158+
}
159+
}
160+
161+
if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
116162
exit 1
117163
}
118164
}
119165
}
120-
121-
if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
122-
exit 1
123-
}
124166
}
125167
else {
126168
Write-Host "No native tools defined in global.json"
@@ -134,7 +176,7 @@ try {
134176
Write-Host "Native tools are available from" (Convert-Path -Path $InstallBin)
135177
Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)"
136178
}
137-
else {
179+
elseif (-not ($PathPromotion)) {
138180
Write-Error "Native tools install directory does not exist, installation failed"
139181
exit 1
140182
}

‎eng/common/templates/job/execute-sdl.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ jobs:
1919
variables:
2020
- group: DotNet-VSTS-Bot
2121
pool:
22-
vmImage: windows-2019
22+
name: NetCore1ESPool-Svc-Internal
23+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
2324
steps:
2425
- checkout: self
2526
clean: true

‎eng/common/templates/job/onelocbuild.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ parameters:
44

55
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
66
pool:
7-
vmImage: windows-2019
7+
name: NetCore1ESPool-Svc-Internal
8+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
89

910
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
1011
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)

‎eng/common/templates/jobs/jobs.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ jobs:
7474
- ${{ each job in parameters.jobs }}:
7575
- ${{ job.job }}
7676
pool:
77-
vmImage: windows-2019
77+
name: NetCore1ESPool-Svc-Internal
78+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
7879
runAsPublic: ${{ parameters.runAsPublic }}
7980
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
8081
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
@@ -87,4 +88,5 @@ jobs:
8788
dependsOn:
8889
- Asset_Registry_Publish
8990
pool:
90-
vmImage: windows-2019
91+
name: NetCore1ESPool-Svc-Internal
92+
demands: ImageOverride -equals Build.Server.Amd64.VS2019

‎eng/common/templates/post-build/channels/generic-internal-channel.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ stages:
2424
variables:
2525
- group: DotNet-Symbol-Server-Pats
2626
pool:
27-
vmImage: 'windows-2019'
27+
name: NetCore1ESPool-Svc-Internal
28+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
2829
steps:
2930
# This is necessary whenever we want to publish/restore to an AzDO private feed
3031
- task: NuGetAuthenticate@0
@@ -67,7 +68,8 @@ stages:
6768
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
6869
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
6970
pool:
70-
vmImage: 'windows-2019'
71+
name: NetCore1ESPool-Svc-Internal
72+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
7173
steps:
7274
- task: DownloadBuildArtifacts@0
7375
displayName: Download Package Artifacts

‎eng/common/templates/post-build/channels/generic-public-channel.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ stages:
2525
variables:
2626
- group: DotNet-Symbol-Server-Pats
2727
pool:
28-
vmImage: 'windows-2019'
28+
name: NetCore1ESPool-Svc-Internal
29+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
2930
steps:
3031
- task: DownloadBuildArtifacts@0
3132
displayName: Download Blob Artifacts
@@ -74,7 +75,8 @@ stages:
7475
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
7576
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
7677
pool:
77-
vmImage: 'windows-2019'
78+
name: NetCore1ESPool-Svc-Internal
79+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
7880
steps:
7981
- task: DownloadBuildArtifacts@0
8082
displayName: Download Package Artifacts

‎eng/common/templates/post-build/darc-gather-drop.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ jobs:
1010
- name: BARBuildId
1111
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
1212
pool:
13-
vmImage: 'windows-2019'
13+
name: NetCore1ESPool-Svc-Internal
14+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
1415
steps:
1516
- task: PowerShell@2
1617
displayName: Darc gather-drop

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ stages:
2828
- job:
2929
displayName: NuGet Validation
3030
pool:
31-
vmImage: 'windows-2019'
31+
name: NetCore1ESPool-Svc-Internal
32+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
3233
steps:
3334
- task: DownloadBuildArtifacts@0
3435
displayName: Download Package Artifacts
@@ -47,7 +48,8 @@ stages:
4748
- job:
4849
displayName: Signing Validation
4950
pool:
50-
vmImage: 'windows-2019'
51+
name: NetCore1ESPool-Svc-Internal
52+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
5153
steps:
5254
# This is necessary whenever we want to publish/restore to an AzDO private feed
5355
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
@@ -77,7 +79,8 @@ stages:
7779
variables:
7880
- template: common-variables.yml
7981
pool:
80-
vmImage: 'windows-2019'
82+
name: NetCore1ESPool-Svc-Internal
83+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
8184
steps:
8285
- task: DownloadBuildArtifacts@0
8386
displayName: Download Blob Artifacts

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ jobs:
1212
- name: ChannelId
1313
value: ${{ parameters.ChannelId }}
1414
pool:
15-
vmImage: 'windows-2019'
15+
name: NetCore1ESPool-Svc-Internal
16+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
1617
steps:
1718
- task: PowerShell@2
1819
displayName: Add Build to Channel

‎eng/common/templates/post-build/setup-maestro-vars.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ jobs:
22
- job: setupMaestroVars
33
displayName: Setup Maestro Vars
44
pool:
5-
vmImage: 'windows-2019'
5+
name: NetCore1ESPool-Svc-Internal
6+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
67
steps:
78
- task: DownloadBuildArtifacts@0
89
displayName: Download Release Configs

‎eng/common/tools.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,10 @@ function InitializeNativeTools() {
568568
InstallDirectory = "$ToolsDir"
569569
}
570570
}
571+
if ($env:NativeToolsOnMachine) {
572+
Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..."
573+
$nativeArgs += @{ PathPromotion = $true }
574+
}
571575
& "$PSScriptRoot/init-tools-native.ps1" @nativeArgs
572576
}
573577
}

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
},
2727
"msbuild-sdks": {
2828
"Yarn.MSBuild": "1.22.10",
29-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22314.5"
29+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22378.5"
3030
}
3131
}

0 commit comments

Comments
 (0)