Update .NET SDK to 6.0.100-rc.2.21424.34 (dotnet#35691)

* Update .NET SDK to `6.0.100-rc.2.21424.34` * Add workaround for netstandard builds * Suppress CS8969 error * Apply suggestions from code review Co-authored-by: Safia Abdalla <[email protected]>
duc-tv · Aug 25, 2021 · dd78b44 · dd78b44
1 parent 52de4ad
commit dd78b44
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "6.0.100-rc.1.21415.3"
+    "version": "6.0.100-rc.2.21424.34"
   },
   "tools": {
-    "dotnet": "6.0.100-rc.1.21415.3",
+    "dotnet": "6.0.100-rc.2.21424.34",
     "runtimes": {
       "dotnet/x64": [
         "2.1.27",