From 1fafcfae1bd23cb3dec36099a1e6e0a53e55b83f Mon Sep 17 00:00:00 2001
From: Chris Ross <chrross@microsoft.com>
Date: Mon, 30 Aug 2021 22:13:38 -0700
Subject: [PATCH] Update .NET SDK to 6.0.100-rc.2.21430.28 (#35948)
---
eng/Workarounds.props | 5 +++++
global.json | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/eng/Workarounds.props b/eng/Workarounds.props
index fefd3da9e6d..a9561f83769 100644
--- a/eng/Workarounds.props
+++ b/eng/Workarounds.props
@@ -25,6 +25,11 @@
<UseSharedCompilation>true</UseSharedCompilation>
</PropertyGroup>
+ <!-- Workaround continued use of netcoreapp2.1. -->
+ <PropertyGroup>
+ <NoWarn>$(NoWarn);NETSDK1138;CS8969</NoWarn>
+ </PropertyGroup>
+
<PropertyGroup>
<!-- Ignore warning about calling the Pack target on Web SDK projects. Our build scripts call /t:pack on everything in this repo. -->
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
diff --git a/global.json b/global.json
index f5126fd382b..0484118f2a7 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
{
"sdk": {
- "version": "6.0.100-rc.1.21415.3"
+ "version": "6.0.100-rc.2.21430.28"
},
"tools": {
- "dotnet": "6.0.100-rc.1.21415.3",
+ "dotnet": "6.0.100-rc.2.21430.28",
"runtimes": {
"dotnet/x64": [
"2.1.27",
--
GitLab