Update to released SDK

As part of this we need to disable a roslyn analyzer to workaround
https://github.com/dotnet/roslyn-analyzers/issues/1804.

Commit migrated from https://github.com/dotnet/corefx/commit/4865c849d582e24478f08a224aa1f915bfcfbcde

diff --git a/src/libraries/CodeAnalysis.ruleset b/src/libraries/CodeAnalysis.ruleset
index 2bf447f..8920fd2 100644 (file)
--- a/src/libraries/CodeAnalysis.ruleset
+++ b/src/libraries/CodeAnalysis.ruleset
@@ -35,4 +35,8 @@
     <Rule Id="CA5350" Action="Error" /> <!-- Do not use Weak/Broken cryptographic algorithms -->
     <Rule Id="CA5351" Action="Error" />
   </Rules>
-</RuleSet>
+  <Rules AnalyzerId="Microsoft.AnalyzerPowerPack.CSharp" RuleNamespace="Microsoft.AnalyzerPowerPack.CSharp">
+    <!-- Disable analyzer warning 1821 until https://github.com/dotnet/roslyn-analyzers/issues/1804 is resolved -->
+    <Rule Id="CA1821" Action="None" />
+  </Rules>
+</RuleSet>
\ No newline at end of file

diff --git a/src/libraries/DotnetCLIVersion.txt b/src/libraries/DotnetCLIVersion.txt
index 3aa4b00..6f1c03c 100644 (file)
--- a/src/libraries/DotnetCLIVersion.txt
+++ b/src/libraries/DotnetCLIVersion.txt
@@ -1 +1 @@
-2.1.401-preview-009081
+2.1.401
\ No newline at end of file