Skip to content

Commit 600e806

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20220923.1 (dotnet#44179)
[main] Update dependencies from dotnet/arcade
1 parent 394b00d commit 600e806

File tree

6 files changed

+25
-14
lines changed

6 files changed

+25
-14
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,22 @@
302302
<Uri>https://github.com/dotnet/runtime</Uri>
303303
<Sha>b0920912512aa7e205363b046a1911e6a97df31f</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22466.3">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22473.1">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>bf47db2617320c82f94713d7b538f7bc0fa9d662</Sha>
307+
<Sha>ba4d2568dd2e3e7538feeaba60215f7bcb99e89c</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22466.3">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22473.1">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>bf47db2617320c82f94713d7b538f7bc0fa9d662</Sha>
312+
<Sha>ba4d2568dd2e3e7538feeaba60215f7bcb99e89c</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22466.3">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22473.1">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>bf47db2617320c82f94713d7b538f7bc0fa9d662</Sha>
316+
<Sha>ba4d2568dd2e3e7538feeaba60215f7bcb99e89c</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22466.3">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22473.1">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>bf47db2617320c82f94713d7b538f7bc0fa9d662</Sha>
320+
<Sha>ba4d2568dd2e3e7538feeaba60215f7bcb99e89c</Sha>
321321
</Dependency>
322322
</ToolsetDependencies>
323323
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@
135135
<MicrosoftEntityFrameworkCoreVersion>8.0.0-alpha.1.22472.8</MicrosoftEntityFrameworkCoreVersion>
136136
<MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-alpha.1.22472.8</MicrosoftEntityFrameworkCoreDesignVersion>
137137
<!-- Packages from dotnet/arcade -->
138-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22466.3</MicrosoftDotNetBuildTasksInstallersVersion>
139-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22466.3</MicrosoftDotNetBuildTasksTemplatingVersion>
138+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22473.1</MicrosoftDotNetBuildTasksInstallersVersion>
139+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22473.1</MicrosoftDotNetBuildTasksTemplatingVersion>
140140
<!-- Packages from dotnet/source-build-externals -->
141141
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.22463.4</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
142142
<!-- Packages from dotnet/xdt -->

eng/common/build.ps1

Lines changed: 5 additions & 0 deletions
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
)
@@ -67,6 +68,7 @@ function Print-Usage() {
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)."
6970
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
71+
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
7072
Write-Host ""
7173

7274
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -146,6 +148,9 @@ try {
146148
$nodeReuse = $false
147149
}
148150

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

eng/common/templates/jobs/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
1515
defaultManagedPlatform:
1616
name: 'Managed'
17-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab'
1818

1919
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
2020
# object in this array is sent to the job template as 'platform'. If no platforms are specified,

eng/common/templates/steps/source-build.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ steps:
6868
publishArgs='--publish'
6969
fi
7070
71+
assetManifestFileName=SourceBuild_RidSpecific.xml
72+
if [ '${{ parameters.platform.name }}' != '' ]; then
73+
assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
74+
fi
75+
7176
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
7277
--configuration $buildConfig \
7378
--restore --build --pack $publishArgs -bl \
@@ -76,7 +81,8 @@ steps:
7681
$internalRestoreArgs \
7782
$targetRidArgs \
7883
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
79-
/p:ArcadeBuildFromSource=true
84+
/p:ArcadeBuildFromSource=true \
85+
/p:AssetManifestFileName=$assetManifestFileName
8086
displayName: Build
8187

8288
# Upload build logs for diagnosis.

global.json

Lines changed: 2 additions & 2 deletions
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": "8.0.0-beta.22466.3",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22466.3"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22473.1",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22473.1"
3232
}
3333
}

0 commit comments

Comments
 (0)