From a45ef9f2d99a911f38154ee9d789051608b9f365 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Thu, 2 Dec 2021 15:25:33 +1300
Subject: [PATCH] Update pipelines image to VS2022 and fix build warnings
 (#2619)

---
 Src/Directory.Build.props                              | 2 +-
 Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj | 2 ++
 azure-pipelines.yml                                    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props
index 66135088..bafd1cd9 100644
--- a/Src/Directory.Build.props
+++ b/Src/Directory.Build.props
@@ -3,7 +3,7 @@
     <AutofacPackageVersion>4.6.2</AutofacPackageVersion>
     <BenchmarkDotNetPackageVersion>0.10.10</BenchmarkDotNetPackageVersion>
     <FSharpCorePackageVersion>4.2.3</FSharpCorePackageVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersPackageVersion>5.0.3</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersPackageVersion>6.0.0</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
     <MicrosoftCSharpPackageVersion>4.3.0</MicrosoftCSharpPackageVersion>
     <MicrosoftSourceLinkGitHubPackageVersion>1.0.0</MicrosoftSourceLinkGitHubPackageVersion>
     <MicrosoftNETTestSdkPackageVersion>16.3.0</MicrosoftNETTestSdkPackageVersion>
diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj
index c074971d..5b355da4 100644
--- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj
+++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj
@@ -16,6 +16,8 @@
     <DebugType Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'netcoreapp2.1' AND '$(TargetFramework)' != 'netcoreapp3.1' AND '$(TargetFramework)' != 'net5.0'">Full</DebugType>    
     <!-- Disabled because SourceLink isn't referenced to calculate paths -->
     <DeterministicSourcePaths>false</DeterministicSourcePaths>
+    <!-- It's ok if a test target has exited support. Disable NETSSDK1138 warning -->
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 85e6cfa7..9ff4dd64 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -3,7 +3,7 @@ trigger:
 - release/*
 
 pool:
-  vmImage: 'windows-2019'
+  vmImage: 'windows-2022'
 
 steps:
 - task: UseDotNet@2