Skip to content

Commit a2b2968

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20221013.4 (#44548)
[release/7.0] Update dependencies from dotnet/arcade
1 parent 0e706ca commit a2b2968

File tree

7 files changed

+24
-17
lines changed

7 files changed

+24
-17
lines changed

Diff for: ‎eng/Version.Details.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,22 @@
302302
<Uri>https://github.com/dotnet/runtime</Uri>
303303
<Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22464.4">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22513.4">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
307+
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22464.4">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22513.4">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
312+
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22464.4">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22513.4">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
316+
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22464.4">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22513.4">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
320+
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
321321
</Dependency>
322322
</ToolsetDependencies>
323323
</Dependencies>

Diff for: ‎eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@
134134
<MicrosoftEntityFrameworkCoreVersion>7.0.0</MicrosoftEntityFrameworkCoreVersion>
135135
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.0</MicrosoftEntityFrameworkCoreDesignVersion>
136136
<!-- Packages from dotnet/arcade -->
137-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22464.4</MicrosoftDotNetBuildTasksInstallersVersion>
138-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22464.4</MicrosoftDotNetBuildTasksTemplatingVersion>
137+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22513.4</MicrosoftDotNetBuildTasksInstallersVersion>
138+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22513.4</MicrosoftDotNetBuildTasksTemplatingVersion>
139139
<!-- Packages from dotnet/source-build-externals -->
140140
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.22505.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
141141
<!-- Packages from dotnet/xdt -->

Diff for: ‎eng/common/build.ps1

+5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Param(
2626
[string] $runtimeSourceFeed = '',
2727
[string] $runtimeSourceFeedKey = '',
2828
[switch] $excludePrereleaseVS,
29+
[switch] $nativeToolsOnMachine,
2930
[switch] $help,
3031
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
3132
)
@@ -66,6 +67,7 @@ function Print-Usage() {
6667
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
6768
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6869
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
70+
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
6971
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
7072
Write-Host ""
7173

@@ -146,6 +148,9 @@ try {
146148
$nodeReuse = $false
147149
}
148150

151+
if ($nativeToolsOnMachine) {
152+
$env:NativeToolsOnMachine = $true
153+
}
149154
if ($restore) {
150155
InitializeNativeTools
151156
}

Diff for: ‎eng/common/init-tools-native.ps1

+4-2
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,12 @@ try {
9898
Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
9999
exit 1
100100
}
101-
$ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0]
102-
if ([string]::IsNullOrWhiteSpace($ToolDirectory)) {
101+
$ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)
102+
if ($ToolDirectories -eq $null) {
103103
Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image."
104104
exit 1
105105
}
106+
$ToolDirectory = $ToolDirectories[0]
106107
$BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
107108
if (-not (Test-Path -Path "$BinPathFile")) {
108109
Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."
@@ -112,6 +113,7 @@ try {
112113
$ToolPath = Convert-Path -Path $BinPath
113114
Write-Host "Adding $ToolName to the path ($ToolPath)..."
114115
Write-Host "##vso[task.prependpath]$ToolPath"
116+
$env:PATH = "$ToolPath;$env:PATH"
115117
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
116118
}
117119
}

Diff for: ‎eng/common/sdk-task.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.2.1" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

Diff for: ‎eng/common/tools.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
365365

366366
# If the version of msbuild is going to be xcopied,
367367
# use this version. Version matches a package here:
368-
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview
369-
$defaultXCopyMSBuildVersion = '17.2.1'
368+
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview
369+
$defaultXCopyMSBuildVersion = '17.3.1'
370370

371371
if (!$vsRequirements) {
372372
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

Diff for: ‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22464.4",
31-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22464.4"
30+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4",
31+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22513.4"
3232
}
3333
}

0 commit comments

Comments
 (0)