Ver Fonte

Update .NET SDK to `6.0.100-rc.2.21424.34` (#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]>
Doug Bunting há 4 anos atrás
pai
commit
dd78b4469d
2 ficheiros alterados com 7 adições e 2 exclusões
  1. 5 0
      eng/Workarounds.props
  2. 2 2
      global.json

+ 5 - 0
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>

+ 2 - 2
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",