Skip to content

Commit 2bb7dce

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20230110.6 (#301)
Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22564.9 -> To Version 6.0.0-beta.23060.6 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 22b1f99 commit 2bb7dce

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22564.9">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23060.6">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
8+
<Sha>74b7648c106865057c78ca1e4b2ffcb5e9bce071</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/common/cross/toolchain.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
22

3+
# reset platform variables (e.g. cmake 3.25 sets LINUX=1)
4+
unset(LINUX)
5+
unset(FREEBSD)
6+
unset(ILLUMOS)
7+
unset(ANDROID)
8+
unset(TIZEN)
9+
310
set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
411
if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
512
set(CMAKE_SYSTEM_NAME FreeBSD)

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"sdk": {
3-
"version": "6.0.111",
3+
"version": "6.0.113",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "6.0.111"
8+
"dotnet": "6.0.113"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22564.9",
11+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6",
1212
"Microsoft.Build.NoTargets": "2.0.1",
1313
"Microsoft.Build.Traversal": "3.0.2"
1414
}

0 commit comments

Comments
 (0)