File tree Expand file tree Collapse file tree 6 files changed +25
-14
lines changed Expand file tree Collapse file tree 6 files changed +25
-14
lines changed Original file line number Diff line number Diff line change 302
302
<Uri >https://github.com/dotnet/runtime</Uri >
303
303
<Sha >b0920912512aa7e205363b046a1911e6a97df31f</Sha >
304
304
</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 " >
306
306
<Uri >https://github.com/dotnet/arcade</Uri >
307
- <Sha >bf47db2617320c82f94713d7b538f7bc0fa9d662 </Sha >
307
+ <Sha >ba4d2568dd2e3e7538feeaba60215f7bcb99e89c </Sha >
308
308
<SourceBuild RepoName =" arcade" ManagedOnly =" true" />
309
309
</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 " >
311
311
<Uri >https://github.com/dotnet/arcade</Uri >
312
- <Sha >bf47db2617320c82f94713d7b538f7bc0fa9d662 </Sha >
312
+ <Sha >ba4d2568dd2e3e7538feeaba60215f7bcb99e89c </Sha >
313
313
</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 " >
315
315
<Uri >https://github.com/dotnet/arcade</Uri >
316
- <Sha >bf47db2617320c82f94713d7b538f7bc0fa9d662 </Sha >
316
+ <Sha >ba4d2568dd2e3e7538feeaba60215f7bcb99e89c </Sha >
317
317
</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 " >
319
319
<Uri >https://github.com/dotnet/arcade</Uri >
320
- <Sha >bf47db2617320c82f94713d7b538f7bc0fa9d662 </Sha >
320
+ <Sha >ba4d2568dd2e3e7538feeaba60215f7bcb99e89c </Sha >
321
321
</Dependency >
322
322
</ToolsetDependencies >
323
323
</Dependencies >
Original file line number Diff line number Diff line change 135
135
<MicrosoftEntityFrameworkCoreVersion >8.0.0-alpha.1.22472.8</MicrosoftEntityFrameworkCoreVersion >
136
136
<MicrosoftEntityFrameworkCoreDesignVersion >8.0.0-alpha.1.22472.8</MicrosoftEntityFrameworkCoreDesignVersion >
137
137
<!-- 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 >
140
140
<!-- Packages from dotnet/source-build-externals -->
141
141
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion >8.0.0-alpha.1.22463.4</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion >
142
142
<!-- Packages from dotnet/xdt -->
Original file line number Diff line number Diff line change 26
26
[string ] $runtimeSourceFeed = ' ' ,
27
27
[string ] $runtimeSourceFeedKey = ' ' ,
28
28
[switch ] $excludePrereleaseVS ,
29
+ [switch ] $nativeToolsOnMachine ,
29
30
[switch ] $help ,
30
31
[Parameter (ValueFromRemainingArguments = $true )][String []]$properties
31
32
)
@@ -67,6 +68,7 @@ function Print-Usage() {
67
68
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
68
69
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
69
70
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)"
70
72
Write-Host " "
71
73
72
74
Write-Host " Command line arguments not listed above are passed thru to msbuild."
@@ -146,6 +148,9 @@ try {
146
148
$nodeReuse = $false
147
149
}
148
150
151
+ if ($nativeToolsOnMachine ) {
152
+ $env: NativeToolsOnMachine = $true
153
+ }
149
154
if ($restore ) {
150
155
InitializeNativeTools
151
156
}
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ parameters:
14
14
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
15
15
defaultManagedPlatform :
16
16
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 '
18
18
19
19
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
20
20
# object in this array is sent to the job template as 'platform'. If no platforms are specified,
Original file line number Diff line number Diff line change @@ -68,6 +68,11 @@ steps:
68
68
publishArgs='--publish'
69
69
fi
70
70
71
+ assetManifestFileName=SourceBuild_RidSpecific.xml
72
+ if [ '${{ parameters.platform.name }}' != '' ]; then
73
+ assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
74
+ fi
75
+
71
76
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
72
77
--configuration $buildConfig \
73
78
--restore --build --pack $publishArgs -bl \
76
81
$internalRestoreArgs \
77
82
$targetRidArgs \
78
83
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
79
- /p:ArcadeBuildFromSource=true
84
+ /p:ArcadeBuildFromSource=true \
85
+ /p:AssetManifestFileName=$assetManifestFileName
80
86
displayName : Build
81
87
82
88
# Upload build logs for diagnosis.
Original file line number Diff line number Diff line change 27
27
},
28
28
"msbuild-sdks" : {
29
29
"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 "
32
32
}
33
33
}
You can’t perform that action at this time.
0 commit comments