From cc5bd785a23386435ff90a6f350115b81d353b08 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 11 Jan 2023 22:23:56 +0000
Subject: [PATCH] [release/6.0.1xx] Update dependencies from dotnet/arcade
(#15263)
[release/6.0.1xx] Update dependencies from dotnet/arcade
---
NuGet.config | 12 ++++++++++--
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 2 +-
eng/common/cross/toolchain.cmake | 7 +++++++
eng/common/templates/steps/source-build.yml | 6 ++++++
global.json | 6 +++---
6 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 6534504cbd09..14a0481f648b 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,10 +7,11 @@
-
+
+
@@ -19,9 +20,13 @@
+
+
+
+
@@ -42,16 +47,19 @@
-
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ca15599a1a39..993e9cbf0aef 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -197,19 +197,19 @@
-
+
https://github.com/dotnet/arcade
- 0967701e5527a1be21d9473821077c3f4be7f9dc
+ 74b7648c106865057c78ca1e4b2ffcb5e9bce071
-
+
https://github.com/dotnet/arcade
- 0967701e5527a1be21d9473821077c3f4be7f9dc
+ 74b7648c106865057c78ca1e4b2ffcb5e9bce071
-
+
https://github.com/dotnet/arcade
- 0967701e5527a1be21d9473821077c3f4be7f9dc
+ 74b7648c106865057c78ca1e4b2ffcb5e9bce071
https://github.com/dotnet/source-build-reference-packages
diff --git a/eng/Versions.props b/eng/Versions.props
index 7092f8531bf4..abee852d7ba7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,7 +19,7 @@
- 6.0.0-beta.22561.1
+ 6.0.0-beta.23060.6
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index ec8971eb0195..51f30e53dd43 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -1,5 +1,12 @@
set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
+# reset platform variables (e.g. cmake 3.25 sets LINUX=1)
+unset(LINUX)
+unset(FREEBSD)
+unset(ILLUMOS)
+unset(ANDROID)
+unset(TIZEN)
+
set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
set(CMAKE_SYSTEM_NAME FreeBSD)
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index abb1b2bcda42..b5b3e5aeb3b9 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -63,6 +63,11 @@ steps:
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
fi
+ runtimeOsArgs=
+ if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
+ runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
+ fi
+
publishArgs=
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
publishArgs='--publish'
@@ -75,6 +80,7 @@ steps:
$internalRuntimeDownloadArgs \
$internalRestoreArgs \
$targetRidArgs \
+ $runtimeOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true
displayName: Build
diff --git a/global.json b/global.json
index 30864f9a77c6..50c158ed8b3e 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "6.0.111",
+ "dotnet": "6.0.113",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
@@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1",
- "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22561.1"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6",
+ "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23060.6"
}
}