8000 Update dependencies from https://github.com/dotnet/arcade build 20240… · dotnet/wpf-test@5ab9f93 · GitHub
[go: up one dir, main page]

Skip to content

Commit 5ab9f93

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20240605.5 (#304)
[main] Update dependencies from dotnet/arcade
1 parent 9d33239 commit 5ab9f93

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24305.1">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24305.5">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087</Sha>
6+
<Sha>f00e1ca5808b15b206042d50cad7cc1c69d3d938</Sha>
77
</Dependency>
88
<Dependency Name="Microsoft.DotNet.Arcade.Wpf.Sdk" Version="6.0.0-preview.5.21220.1">
99
<Uri>https://github.com/dotnet/wpf</Uri>

eng/common/cross/build-android-rootfs.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ __NDK_Version=r21
55
usage()
66
{
77
echo "Creates a toolchain and sysroot used for cross-compiling for Android."
8-
echo.
8+
echo
99
echo "Usage: $0 [BuildArch] [ApiLevel]"
10-
echo.
10+
echo
1111
echo "BuildArch is the target architecture of Android. Currently only arm64 is supported."
1212
echo "ApiLevel is the target Android API level. API levels usually match to Android releases. See https://source.android.com/source/build-numbers.html"
13-
echo.
13+
echo
1414
echo "By default, the toolchain and sysroot will be generated in cross/android-rootfs/toolchain/[BuildArch]. You can change this behavior"
1515
echo "by setting the TOOLCHAIN_DIR environment variable"
16-
echo.
16+
echo
1717
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,"
1818
echo "you can set the NDK_DIR environment variable to have this script use that installation of the NDK."
1919
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."

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24305.1",
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24305.5",
1616
"Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6",
1717
"Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7"
1818
},

0 commit comments

Comments
 (0)
0