Skip to content

Commit 4bcc04f

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20220811.3 (#43242)
[release/6.0] Update dependencies from dotnet/arcade
1 parent f528bf8 commit 4bcc04f

14 files changed

+145
-69
lines changed

‎NuGet.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-55fb7ef" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-55fb7ef9/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-runtime -->
98
<!-- Begin: Package sources from dotnet-efcore -->
10-
<add key="darc-int-dotnet-efcore-62e1b2f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-62e1b2f4/nuget/v3/index.json" />
119
<!-- End: Package sources from dotnet-efcore -->
1210
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1311
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -27,10 +25,8 @@
2725
<clear />
2826
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2927
<!-- Begin: Package sources from dotnet-efcore -->
30-
<add key="darc-int-dotnet-efcore-62e1b2f" value="true" />
3128
<!-- End: Package sources from dotnet-efcore -->
3229
<!-- Begin: Package sources from dotnet-runtime -->
33-
<add key="darc-int-dotnet-runtime-55fb7ef" value="true" />
3430
<!-- End: Package sources from dotnet-runtime -->
3531
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3632
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>f316191dbb5782d76ceb457018dcd80ff8ce8692</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22314.7">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22411.3">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
285+
<Sha>778552f02f31d50ec1c3c18a872cc482d04aec75</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22314.7">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22411.3">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
290+
<Sha>778552f02f31d50ec1c3c18a872cc482d04aec75</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22314.7">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22411.3">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
294+
<Sha>778552f02f31d50ec1c3c18a872cc482d04aec75</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22314.7">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22411.3">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
298+
<Sha>778552f02f31d50ec1c3c18a872cc482d04aec75</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.8</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.8</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22411.3</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22411.3</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

‎eng/common/generate-sbom-prep.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ Param(
22
[Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed
33
)
44

5+
. $PSScriptRoot\pipeline-logging-functions.ps1
6+
57
Write-Host "Creating dir $ManifestDirPath"
68
# create directory for sbom manifest to be placed
79
if (!(Test-Path -path $ManifestDirPath))

‎eng/common/generate-sbom-prep.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22

33
source="${BASH_SOURCE[0]}"
44

5+
# resolve $SOURCE until the file is no longer a symlink
6+
while [[ -h $source ]]; do
7+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
8+
source="$(readlink "$source")"
9+
10+
# if $source was a relative symlink, we need to resolve it relative to the path where the
11+
# symlink file was located
12+
[[ $source != /* ]] && source="$scriptroot/$source"
13+
done
14+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
15+
. $scriptroot/pipeline-logging-functions.sh
16+
517
manifest_dir=$1
618

719
if [ ! -d "$manifest_dir" ] ; then

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

Lines changed: 98 additions & 46 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) {
@@ -77,53 +82,100 @@ try {
7782
ConvertFrom-Json |
7883
Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue
7984
if ($NativeTools) {
80-
$NativeTools.PSObject.Properties | ForEach-Object {
81-
$ToolName = $_.Name
82-
$ToolVersion = $_.Value
83-
$LocalInstallerArguments = @{ ToolName = "$ToolName" }
84-
$LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
85-
$LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
86-
$LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
87-
$LocalInstallerArguments += @{ Version = "$ToolVersion" }
88-
89-
if ($Verbose) {
90-
$LocalInstallerArguments += @{ Verbose = $True }
91-
}
92-
if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
93-
if($Force) {
94-
$LocalInstallerArguments += @{ Force = $True }
95-
}
96-
}
97-
if ($Clean) {
98-
$LocalInstallerArguments += @{ Clean = $True }
99-
}
100-
101-
Write-Verbose "Installing $ToolName version $ToolVersion"
102-
Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
103-
& $InstallerPath @LocalInstallerArguments
104-
if ($LASTEXITCODE -Ne "0") {
105-
$errMsg = "$ToolName installation failed"
106-
if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
107-
$showNativeToolsWarning = $true
108-
if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
109-
$showNativeToolsWarning = $false
85+
if ($PathPromotion -eq $True) {
86+
if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build
87+
$NativeTools.PSObject.Properties | ForEach-Object {
88+
$ToolName = $_.Name
89+
$ToolVersion = $_.Value
90+
$InstalledTools = @{}
91+
92+
if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
93+
if ($ToolVersion -eq "latest") {
94+
$ToolVersion = ""
95+
}
96+
$ArcadeToolsDirectory = "C:\arcade-tools"
97+
if (-not (Test-Path $ArcadeToolsDirectory)) {
98+
Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
99+
exit 1
100+
}
101+
$ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0]
102+
if ([string]::IsNullOrWhiteSpace($ToolDirectory)) {
103+
Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image."
104+
exit 1
110105
}
111-
if ($showNativeToolsWarning) {
112-
Write-Warning $errMsg
106+
$BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
107+
if (-not (Test-Path -Path "$BinPathFile")) {
108+
Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."
109+
exit 1
113110
}
114-
$toolInstallationFailure = $true
115-
} else {
116-
# We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482
117-
Write-Host $errMsg
118-
exit 1
111+
$BinPath = Get-Content "$BinPathFile"
112+
$ToolPath = Convert-Path -Path $BinPath
113+
Write-Host "Adding $ToolName to the path ($ToolPath)..."
114+
Write-Host "##vso[task.prependpath]$ToolPath"
115+
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
116+
}
119117
}
118+
return $InstalledTools
119+
} else {
120+
$NativeTools.PSObject.Properties | ForEach-Object {
121+
$ToolName = $_.Name
122+
$ToolVersion = $_.Value
123+
124+
if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
125+
Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding."
126+
}
127+
}
128+
exit 0
129+
}
130+
} else {
131+
$NativeTools.PSObject.Properties | ForEach-Object {
132+
$ToolName = $_.Name
133+
$ToolVersion = $_.Value
134+
$LocalInstallerArguments = @{ ToolName = "$ToolName" }
135+
$LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
136+
$LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
137+
$LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
138+
$LocalInstallerArguments += @{ Version = "$ToolVersion" }
139+
140+
if ($Verbose) {
141+
$LocalInstallerArguments += @{ Verbose = $True }
142+
}
143+
if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
144+
if($Force) {
145+
$LocalInstallerArguments += @{ Force = $True }
146+
}
147+
}
148+
if ($Clean) {
149+
$LocalInstallerArguments += @{ Clean = $True }
150+
}
151+
152+
Write-Verbose "Installing $ToolName version $ToolVersion"
153+
Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
154+
& $InstallerPath @LocalInstallerArguments
155+
if ($LASTEXITCODE -Ne "0") {
156+
$errMsg = "$ToolName installation failed"
157+
if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
158+
$showNativeToolsWarning = $true
159+
if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
160+
$showNativeToolsWarning = $false
161+
}
162+
if ($showNativeToolsWarning) {
163+
Write-Warning $errMsg
164+
}
165+
$toolInstallationFailure = $true
166+
} else {
167+
# We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482
168+
Write-Host $errMsg
169+
exit 1
170+
}
171+
}
172+
}
173+
174+
if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
175+
# We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482
176+
Write-Host 'Native tools bootstrap failed'
177+
exit 1
120178
}
121-
}
122-
123-
if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
124-
# We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482
125-
Write-Host 'Native tools bootstrap failed'
126-
exit 1
127179
}
128180
}
129181
else {
@@ -139,7 +191,7 @@ try {
139191
Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)"
140192
return $InstallBin
141193
}
142-
else {
194+
elseif (-not ($PathPromotion)) {
143195
Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed'
144196
exit 1
145197
}
@@ -149,4 +201,4 @@ catch {
149201
Write-Host $_.ScriptStackTrace
150202
Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message $_
151203
ExitWithExitCode 1
152-
}
204+
}

‎eng/common/internal/NuGet.config

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
6+
</packageSources>
7+
</configuration>

‎eng/common/internal/Tools.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
<ItemGroup>
99
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->
1010
<PackageReference Remove="@(PackageReference)"/>
11+
<PackageReference Include="Microsoft.ManifestTool.CrossPlatform" Version="$(MicrosoftManifestToolCrossPlatformVersion)" />
12+
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(MicrosoftVisualStudioEngMicroBuildCoreVersion)" />
13+
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" Version="$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)" />
1114
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
1215
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
1316
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
# If it's not devdiv, it's dnceng
5555
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
5656
name: NetCore1ESPool-Internal
57-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
57+
demands: ImageOverride -equals windows.vs2019.amd64
5858
steps:
5959
- checkout: self
6060
clean: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
# If it's not devdiv, it's dnceng
4242
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
4343
name: NetCore1ESPool-Internal
44-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
44+
demands: ImageOverride -equals windows.vs2019.amd64
4545

4646
variables:
4747
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat

0 commit comments

Comments
 (0)