From cd94a183d2e846298028d7a4bd22ae94783d42e9 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 14:00:42 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20240605.5 (#6787)
[feature/9.x] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 6 +++---
eng/common/cross/build-android-rootfs.sh | 8 ++++----
global.json | 4 ++--
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 696de538b80..1f61aa10dee 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -22,25 +22,25 @@
https://github.com/dotnet/roslyn-analyzers
333f90a3051f084e7af42b516b6bdd7ae8e004f3
-
+
https://github.com/dotnet/arcade
- 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087
+ f00e1ca5808b15b206042d50cad7cc1c69d3d938
-
+
https://github.com/dotnet/arcade
- 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087
+ f00e1ca5808b15b206042d50cad7cc1c69d3d938
-
+
https://github.com/dotnet/arcade
- 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087
+ f00e1ca5808b15b206042d50cad7cc1c69d3d938
-
+
https://github.com/dotnet/arcade
- 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087
+ f00e1ca5808b15b206042d50cad7cc1c69d3d938
-
+
https://github.com/dotnet/arcade
- 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087
+ f00e1ca5808b15b206042d50cad7cc1c69d3d938
https://github.com/dotnet/diagnostics
diff --git a/eng/Versions.props b/eng/Versions.props
index eb12779dd8c..c18e98ba170 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,9 +48,9 @@
-->
- 9.0.0-beta.24305.1
- 9.0.0-beta.24305.1
- 9.0.0-beta.24305.1
+ 9.0.0-beta.24305.5
+ 9.0.0-beta.24305.5
+ 9.0.0-beta.24305.5
9.0.0-preview.6.24304.8
9.0.0-preview.6.24304.8
diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh
index f163fb9dae9..7e9ba2b75ed 100644
--- a/eng/common/cross/build-android-rootfs.sh
+++ b/eng/common/cross/build-android-rootfs.sh
@@ -5,15 +5,15 @@ __NDK_Version=r21
usage()
{
echo "Creates a toolchain and sysroot used for cross-compiling for Android."
- echo.
+ echo
echo "Usage: $0 [BuildArch] [ApiLevel]"
- echo.
+ echo
echo "BuildArch is the target architecture of Android. Currently only arm64 is supported."
echo "ApiLevel is the target Android API level. API levels usually match to Android releases. See https://source.android.com/source/build-numbers.html"
- echo.
+ echo
echo "By default, the toolchain and sysroot will be generated in cross/android-rootfs/toolchain/[BuildArch]. You can change this behavior"
echo "by setting the TOOLCHAIN_DIR environment variable"
- echo.
+ echo
echo "By default, the NDK will be downloaded into the cross/android-rootfs/android-ndk-$__NDK_Version directory. If you already have an NDK installation,"
echo "you can set the NDK_DIR environment variable to have this script use that installation of the NDK."
echo "By default, this script will generate a file, android_platform, in the root of the ROOTFS_DIR directory that contains the RID for the supported and tested Android build: android.28-arm64. This file is to replace '/etc/os-release', which is not available for Android."
diff --git a/global.json b/global.json
index 98b8dc4393c..175ad4660b9 100644
--- a/global.json
+++ b/global.json
@@ -31,7 +31,7 @@
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24305.1",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24305.1"
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24305.5",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24305.5"
}
}