From af8b4fb60320817c0a9e316d7666579f365040fd Mon Sep 17 00:00:00 2001 From: Steve MacLean Date: Wed, 20 Jan 2021 14:52:07 -0500 Subject: [PATCH 1/3] Fixup dotnet-install.sh arch detection --- eng/common/dotnet-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 25b69f8787f276..fce5a9f045e5ab 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -57,7 +57,7 @@ if [[ "$cpuname" == "unknown" ]]; then fi case $cpuname in - aarch64) + aarch64|arm64) buildarch=arm64 ;; amd64|x86_64) From 700b9ece3a1b46c30d41b45be9abbaf67d5daf41 Mon Sep 17 00:00:00 2001 From: Steve MacLean Date: Wed, 20 Jan 2021 13:40:32 -0500 Subject: [PATCH 2/3] Build with 6.0.100-preview.1.21103.13 --- Directory.Build.props | 4 ++-- global.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1f3e8c1d192cf3..d1e6c42dc27b97 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -38,8 +38,8 @@ $(MajorVersion).$(MinorVersion) - 5.0 - 5.0 + 6.0 + 6.0 .NETCoreApp $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion) net$(NetCoreAppCurrentVersion) diff --git a/global.json b/global.json index f271ad70ec6bd0..44e50ecf851167 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "5.0.100", + "version": "6.0.100-preview.1.21103.13", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "5.0.100" + "dotnet": "6.0.100-preview.1.21103.13" }, "native-tools": { "cmake": "3.16.4", From 276a9500d52f4e68f9646e67d22fcd6c362d9390 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Wed, 10 Feb 2021 20:17:44 -0800 Subject: [PATCH 3/3] change targetplatformVersion to 1.0 --- eng/targetframeworksuffix.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targetframeworksuffix.props b/eng/targetframeworksuffix.props index e4473df46fa74d..bb1e24f5046c3b 100644 --- a/eng/targetframeworksuffix.props +++ b/eng/targetframeworksuffix.props @@ -7,7 +7,7 @@ $(TargetFrameworkSuffix) - 0.0 + 1.0 $(TargetFrameworkSuffix),Version=$(TargetPlatformVersion)