From 5466048653694f61d0abd51143d0a10db064e09f Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Thu, 6 Feb 2020 13:02:40 -0800
Subject: [PATCH] Update to Microsoft.CodeAnalysis 3.3.1

---
 .editorconfig                                            | 9 +++++++++
 build/Dependencies.props                                 | 7 ++++++-
 .../Microsoft.ML.InternalCodeAnalyzer.csproj             | 4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 09b904a73f..32536b05b8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,6 +19,15 @@ dotnet_diagnostic.VSTHRD105.severity = none
 # VSTHRD200: Use "Async" suffix for async methods
 dotnet_diagnostic.VSTHRD200.severity = none
 
+# RS1024: Compare symbols correctly
+dotnet_diagnostic.RS1024.severity = none
+
+# RS1025: Configure generated code analysis
+dotnet_diagnostic.RS1025.severity = none
+
+# RS1026: Enable concurrent execution
+dotnet_diagnostic.RS1026.severity = none
+
 [test/**/*.cs]
 
 # MSML_GeneralName: This name should be PascalCased
diff --git a/build/Dependencies.props b/build/Dependencies.props
index 567e2d1cd5..571b00c40f 100644
--- a/build/Dependencies.props
+++ b/build/Dependencies.props
@@ -27,9 +27,14 @@
     <TensorflowDotNETVersion>0.11.8.1</TensorflowDotNETVersion>
   </PropertyGroup>
 
-  <!-- Code Analyzer Dependencies -->
+  <!-- Model Builder Dependencies -->
   <PropertyGroup>
     <MicrosoftCodeAnalysisCSharpVersion>2.9.0</MicrosoftCodeAnalysisCSharpVersion>
+  </PropertyGroup>
+
+  <!-- Code Analyzer Dependencies -->
+  <PropertyGroup>
+    <MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>3.3.1</MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>
     <MicrosoftCSharpVersion>4.5.0</MicrosoftCSharpVersion>
     <SystemCompositionVersion>1.2.0</SystemCompositionVersion>
   </PropertyGroup>
diff --git a/tools-local/Microsoft.ML.InternalCodeAnalyzer/Microsoft.ML.InternalCodeAnalyzer.csproj b/tools-local/Microsoft.ML.InternalCodeAnalyzer/Microsoft.ML.InternalCodeAnalyzer.csproj
index cb51f63307..48baae98b8 100644
--- a/tools-local/Microsoft.ML.InternalCodeAnalyzer/Microsoft.ML.InternalCodeAnalyzer.csproj
+++ b/tools-local/Microsoft.ML.InternalCodeAnalyzer/Microsoft.ML.InternalCodeAnalyzer.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion)" />
     <PackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpVersion)" />
     <PackageReference Include="System.Composition" Version="$(SystemCompositionVersion)" />
   </ItemGroup>