From a441ff6228c33df38bdfc8a45dac55548c07dbd7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 20:10:05 +0000
Subject: Update dependencies from https://github.com/dotnet/arcade build
20220923.1 (#3048)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 8 ++++----
eng/Versions.props | 2 +-
eng/common/build.ps1 | 5 +++++
eng/common/templates/jobs/source-build.yml | 2 +-
eng/common/templates/steps/source-build.yml | 8 +++++++-
global.json | 6 +++---
6 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 456a53196..724a1f2e1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,14 +3,14 @@
-
+
https://github.com/dotnet/arcade
- bf47db2617320c82f94713d7b538f7bc0fa9d662
+ ba4d2568dd2e3e7538feeaba60215f7bcb99e89c
-
+
https://github.com/dotnet/arcade
- bf47db2617320c82f94713d7b538f7bc0fa9d662
+ ba4d2568dd2e3e7538feeaba60215f7bcb99e89c
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index dd126fb83..83f1c634e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -18,7 +18,7 @@
5.0.0
17.0.0-preview-21267-01
17.0.0-preview-21267-01
- 8.0.0-beta.22466.3
+ 8.0.0-beta.22473.1
6.0.0-beta.21271.1
3.10.0-2.final
4.4.0-1.final
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 8943da242..33a6f2d0e 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -26,6 +26,7 @@ Param(
[string] $runtimeSourceFeed = '',
[string] $runtimeSourceFeedKey = '',
[switch] $excludePrereleaseVS,
+ [switch] $nativeToolsOnMachine,
[switch] $help,
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
)
@@ -67,6 +68,7 @@ function Print-Usage() {
Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')"
Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
+ Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
Write-Host ""
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -146,6 +148,9 @@ try {
$nodeReuse = $false
}
+ if ($nativeToolsOnMachine) {
+ $env:NativeToolsOnMachine = $true
+ }
if ($restore) {
InitializeNativeTools
}
diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml
index 00aa98eb3..8dd2d355f 100644
--- a/eng/common/templates/jobs/source-build.yml
+++ b/eng/common/templates/jobs/source-build.yml
@@ -14,7 +14,7 @@ parameters:
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
defaultManagedPlatform:
name: 'Managed'
- container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
+ container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab'
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
# object in this array is sent to the job template as 'platform'. If no platforms are specified,
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index 12a8ff94d..4ec5577d2 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -68,6 +68,11 @@ steps:
publishArgs='--publish'
fi
+ assetManifestFileName=SourceBuild_RidSpecific.xml
+ if [ '${{ parameters.platform.name }}' != '' ]; then
+ assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
+ fi
+
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
--configuration $buildConfig \
--restore --build --pack $publishArgs -bl \
@@ -76,7 +81,8 @@ steps:
$internalRestoreArgs \
$targetRidArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
- /p:ArcadeBuildFromSource=true
+ /p:ArcadeBuildFromSource=true \
+ /p:AssetManifestFileName=$assetManifestFileName
displayName: Build
# Upload build logs for diagnosis.
diff --git a/global.json b/global.json
index 32ba9ccfd..80ccc91ed 100644
--- a/global.json
+++ b/global.json
@@ -1,15 +1,15 @@
{
"sdk": {
- "version": "7.0.100-preview.7.22377.5",
+ "version": "7.0.100-rc.1.22431.12",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "7.0.100-preview.7.22377.5",
+ "dotnet": "7.0.100-rc.1.22431.12",
"xcopy-msbuild": "17.2.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22466.3",
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22473.1",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "7.0.0-rtm.22466.6"
}
--
cgit v1.2.3