Retarget to roslyn for VS 2022 Update 14

AArnott · AArnott · commit 3c4aec22ac7f · 2025-09-19T15:53:25.000-06:00
This drop support for VS 2019.
diff --git a/Directory.Packages.Analyzers.props b/Directory.Packages.Analyzers.props
@@ -1,17 +1,16 @@
 <Project>
   <PropertyGroup>
-    <CodeAnalysisVersionForAnalyzers>3.11.0</CodeAnalysisVersionForAnalyzers>
+    <CodeAnalysisVersionForAnalyzers>4.14.0</CodeAnalysisVersionForAnalyzers>
   </PropertyGroup>
   <ItemGroup>
-    <!-- These versions carefully chosen to support VS 2019 Update 11. -->
+    <!-- These versions carefully chosen to support VS 2022 Update 14. -->
     <PackageVersion Update="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersionForAnalyzers)" />
     <PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(CodeAnalysisVersionForAnalyzers)" />
     <PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersionForAnalyzers)" />
-    <PackageVersion Update="System.Collections.Immutable" Version="5.0.0" />
-    <PackageVersion Update="System.Memory" Version="4.5.4" />
-    <PackageVersion Update="System.Reflection.Metadata" Version="5.0.0" />
-    <PackageVersion Update="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
-    <PackageVersion Include="System.Text.Encodings.Web" Version="4.7.1" />
-    <PackageVersion Update="System.Text.Json" Version="4.7.2" />
+    <PackageVersion Update="System.Collections.Immutable" Version="9.0.0" />
+    <PackageVersion Update="System.Memory" Version="4.5.5" />
+    <PackageVersion Update="System.Reflection.Metadata" Version="9.0.0" />
+    <PackageVersion Include="System.Text.Encodings.Web" Version="9.0.0" />
+    <PackageVersion Update="System.Text.Json" Version="9.0.0" />
   </ItemGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -10,12 +10,13 @@
     <WDKMetadataVersion>0.12.8-experimental</WDKMetadataVersion>
     <!-- <DiaMetadataVersion>0.2.185-preview-g7e1e6a442c</DiaMetadataVersion> -->
     <ApiDocsVersion>0.1.42-alpha</ApiDocsVersion>
-    <CodeAnalysisVersion>4.13.0</CodeAnalysisVersion>
+    <CodeAnalysisVersion>4.14.0</CodeAnalysisVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- We have to use the MessagePack version used by win32metadata (https://github.com/microsoft/CsWin32/issues/371) -->
     <PackageVersion Include="MessagePack" Version="2.2.85" />
     <PackageVersion Include="MessagePackAnalyzer" Version="2.5.192" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.3-beta1.24352.1" />
diff --git a/Microsoft.Windows.CsWin32.sln b/Microsoft.Windows.CsWin32.sln
@@ -1,13 +1,14 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.33110.383
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11018.11 main
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1CE9670B-D5FF-46A7-9D00-24E70E6ED48B}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
+		Directory.Packages.Analyzers.props = Directory.Packages.Analyzers.props
 		Directory.Packages.props = Directory.Packages.props
 		global.json = global.json
 		nuget.config = nuget.config
diff --git a/azure-pipelines/integration-test.yml b/azure-pipelines/integration-test.yml
@@ -1,13 +1,10 @@
 jobs:
-# Matrix over VS 2019 and VS 2022
+# Matrix over VS 2022 (and eventually VS 2026)
 
 - job: integrationtest
   displayName: 🧪 Integration tests
   strategy:
     matrix:
-      vs2019:
-        vmImage: windows-2019
-        currentSdk: false
       vs2022:
         vmImage: windows-2022
         currentSdk: true
diff --git a/src/Microsoft.Windows.CsWin32/AnalyzerReleases.Unshipped.md b/src/Microsoft.Windows.CsWin32/AnalyzerReleases.Unshipped.md
@@ -12,4 +12,6 @@ PInvoke004 | Functionality | Warning | SourceGenerator
 PInvoke005 | Functionality | Warning | SourceGenerator
 PInvoke006 | Configuration | Warning | SourceGenerator
 PInvoke007 | Functionality | Error | SourceGenerator
-PInvoke008 | Configuration | Error | SourceGenerator
+PInvoke008 | Configuration | Error | SourceGenerator
+PInvoke009 | Configuration | Warning | SourceGenerator
+PInvoke010 | Configuration | Error | SourceGenerator
diff --git a/src/Microsoft.Windows.CsWin32/BindingRedirects.cs b/src/Microsoft.Windows.CsWin32/BindingRedirects.cs
@@ -10,8 +10,10 @@ internal static class BindingRedirects
 
     static BindingRedirects()
     {
+#pragma warning disable RS1035 // Do not use APIs banned for analyzers
         LocalAssemblies = new Lazy<Dictionary<string, string>>(
             () => Directory.GetFiles(SourceGeneratorAssemblyDirectory, "*.dll").ToDictionary(Path.GetFileNameWithoutExtension, StringComparer.OrdinalIgnoreCase));
+#pragma warning restore RS1035 // Do not use APIs banned for analyzers
     }
 
     private static bool IsNetFramework => RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework", StringComparison.OrdinalIgnoreCase);
diff --git a/src/Microsoft.Windows.CsWin32/Docs.cs b/src/Microsoft.Windows.CsWin32/Docs.cs
@@ -40,7 +40,9 @@ public static Docs Get(string docsPath)
             }
         }
 
+#pragma warning disable RS1035 // Do not use APIs banned for analyzers
         using FileStream docsStream = File.OpenRead(docsPath);
+#pragma warning restore RS1035 // Do not use APIs banned for analyzers
         Dictionary<string, ApiDetails>? data = MessagePackSerializer.Deserialize<Dictionary<string, ApiDetails>>(docsStream, MsgPackOptions);
         var docs = new Docs(data);
 
diff --git a/src/Microsoft.Windows.CsWin32/MetadataCache.cs b/src/Microsoft.Windows.CsWin32/MetadataCache.cs
@@ -19,7 +19,9 @@ internal MetadataFile GetMetadataFile(string path)
         lock (this.metadataFiles)
         {
             MetadataFile? metadataFile;
+#pragma warning disable RS1035 // Do not use APIs banned for analyzers
             DateTime lastWriteTimeUtc = File.GetLastWriteTimeUtc(path);
+#pragma warning restore RS1035 // Do not use APIs banned for analyzers
             if (this.metadataFiles.TryGetValue(path, out metadataFile))
             {
                 if (metadataFile.LastWriteTimeUtc == lastWriteTimeUtc)
diff --git a/src/Microsoft.Windows.CsWin32/MetadataFile.cs b/src/Microsoft.Windows.CsWin32/MetadataFile.cs
@@ -19,7 +19,9 @@ internal class MetadataFile : IDisposable
     internal MetadataFile(string path)
     {
         this.Path = path;
+#pragma warning disable RS1035 // Do not use APIs banned for analyzers
         this.LastWriteTimeUtc = File.GetLastWriteTimeUtc(path);
+#pragma warning restore RS1035 // Do not use APIs banned for analyzers
 
         // When using FileShare.Delete, the OS will allow the file to be deleted, but it does not disrupt
         // our ability to read the file while our handle is open.
diff --git a/src/Microsoft.Windows.CsWin32/MetadataIndex.cs b/src/Microsoft.Windows.CsWin32/MetadataIndex.cs
@@ -21,7 +21,9 @@ namespace Microsoft.Windows.CsWin32;
 [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]
 internal class MetadataIndex
 {
+#pragma warning disable RS1035 // Do not use APIs banned for analyzers
     private static readonly int MaxPooledObjectCount = Math.Max(Environment.ProcessorCount, 4);
+#pragma warning restore RS1035 // Do not use APIs banned for analyzers
 
     private readonly MetadataFile metadataFile;
 
diff --git a/src/Microsoft.Windows.CsWin32/Microsoft.Windows.CsWin32.csproj b/src/Microsoft.Windows.CsWin32/Microsoft.Windows.CsWin32.csproj
@@ -11,6 +11,7 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <NoWarn>$(NoWarn);NU5128;NU5127;NU5104</NoWarn>
     <NuSpecFile>Microsoft.Windows.CsWin32.nuspec</NuSpecFile>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,8 +27,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <AdditionalFiles Include="AnalyzerReleases.Shipped.md" />
-    <AdditionalFiles Include="AnalyzerReleases.Unshipped.md" />
     <AdditionalFiles Include="BannedSymbols.txt" />
   </ItemGroup>
 
@@ -50,7 +49,6 @@
     <PackageReference Include="Microsoft.Windows.SDK.Win32Docs" GeneratePathProperty="true" PrivateAssets="none" />
     <PackageReference Include="Microsoft.Windows.WDK.Win32Metadata" GeneratePathProperty="true" PrivateAssets="none" />
     <PackageReference Include="System.Memory" PrivateAssets="none" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" PrivateAssets="none" />
     <PackageReference Include="System.Reflection.Metadata" />
     <PackageReference Include="System.Text.Encodings.Web" />
     <PackageReference Include="System.Text.Json" />
diff --git a/src/Microsoft.Windows.CsWin32/Microsoft.Windows.CsWin32.targets b/src/Microsoft.Windows.CsWin32/Microsoft.Windows.CsWin32.targets
@@ -35,7 +35,6 @@
       <TfmSpecificPackageFile Include="@(ReferencePath)" PackagePath="analyzers\cs\" Condition=" '%(FileName)%(Extension)' == 'System.Threading.Tasks.Extensions.dll' " />
       <TfmSpecificPackageFile Include="@(ReferencePath)" PackagePath="analyzers\cs\" Condition=" '%(FileName)%(Extension)' == 'System.Memory.dll' " />
       <TfmSpecificPackageFile Include="@(ReferencePath)" PackagePath="analyzers\cs\" Condition=" '%(FileName)%(Extension)' == 'System.Buffers.dll' " />
-      <TfmSpecificPackageFile Include="@(ReferencePath)" PackagePath="analyzers\cs\" Condition=" '%(FileName)%(Extension)' == 'System.Runtime.CompilerServices.Unsafe.dll' " />
       <TfmSpecificPackageFile Include="@(SatelliteDllsProjectOutputGroupDependency)" PackagePath="analyzers\cs\%(SatelliteDllsProjectOutputGroupDependency.DestinationSubDirectory)" Condition=" '%(SatelliteDllsProjectOutputGroupDependency.DestinationSubDirectory)' != '' " />
       <TfmSpecificPackageFile Include="@(SatelliteDllsProjectOutputGroupOutput->'%(FinalOutputPath)')" PackagePath="analyzers\cs\%(SatelliteDllsProjectOutputGroupOutput.Culture)\" />
       <TfmSpecificPackageFile Include="%(_ResolvedProjectReferencePaths.Identity)" PackagePath="analyzers\cs\" />
diff --git a/src/Microsoft.Windows.CsWin32/SourceGenerator.cs b/src/Microsoft.Windows.CsWin32/SourceGenerator.cs
@@ -1,6 +1,9 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#pragma warning disable RS1035 // Do not use APIs banned for analyzers (old style source generator)
+#pragma warning disable RS1042 // Deprecated interface
+
 using System.Text.Json;
 using Microsoft.CodeAnalysis.Text;
 
@@ -172,15 +175,15 @@ public void Execute(GeneratorExecutionContext context)
             return;
         }
 
-        GeneratorOptions options;
+        GeneratorOptions? options;
         AdditionalText? nativeMethodsJsonFile = context.AdditionalFiles
             .FirstOrDefault(af => string.Equals(Path.GetFileName(af.Path), NativeMethodsJsonAdditionalFileName, StringComparison.OrdinalIgnoreCase));
         if (nativeMethodsJsonFile is object)
         {
             string optionsJson = nativeMethodsJsonFile.GetText(context.CancellationToken)!.ToString();
             try
             {
-                options = JsonSerializer.Deserialize<GeneratorOptions>(optionsJson, JsonOptions);
+                options = JsonSerializer.Deserialize<GeneratorOptions>(optionsJson, JsonOptions) ?? new();
             }
             catch (JsonException ex)
             {

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,10 @@ internal static class BindingRedirects`
`10`	`10`
`11`	`11`	`static BindingRedirects()`
`12`	`12`	`{`
	`13`	`+#pragma warning disable RS1035 // Do not use APIs banned for analyzers`
`13`	`14`	`LocalAssemblies = new Lazy<Dictionary<string, string>>(`
`14`	`15`	`() => Directory.GetFiles(SourceGeneratorAssemblyDirectory, "*.dll").ToDictionary(Path.GetFileNameWithoutExtension, StringComparer.OrdinalIgnoreCase));`
	`16`	`+#pragma warning restore RS1035 // Do not use APIs banned for analyzers`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`private static bool IsNetFramework => RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework", StringComparison.OrdinalIgnoreCase);`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@ public static Docs Get(string docsPath)`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
	`43`	`+#pragma warning disable RS1035 // Do not use APIs banned for analyzers`
`43`	`44`	`using FileStream docsStream = File.OpenRead(docsPath);`
	`45`	`+#pragma warning restore RS1035 // Do not use APIs banned for analyzers`
`44`	`46`	`Dictionary<string, ApiDetails>? data = MessagePackSerializer.Deserialize<Dictionary<string, ApiDetails>>(docsStream, MsgPackOptions);`
`45`	`47`	`var docs = new Docs(data);`
`46`	`48`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@ internal MetadataFile GetMetadataFile(string path)`
`19`	`19`	`lock (this.metadataFiles)`
`20`	`20`	`{`
`21`	`21`	`MetadataFile? metadataFile;`
	`22`	`+#pragma warning disable RS1035 // Do not use APIs banned for analyzers`
`22`	`23`	`DateTime lastWriteTimeUtc = File.GetLastWriteTimeUtc(path);`
	`24`	`+#pragma warning restore RS1035 // Do not use APIs banned for analyzers`
`23`	`25`	`if (this.metadataFiles.TryGetValue(path, out metadataFile))`
`24`	`26`	`{`
`25`	`27`	`if (metadataFile.LastWriteTimeUtc == lastWriteTimeUtc)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@ internal class MetadataFile : IDisposable`
`19`	`19`	`internal MetadataFile(string path)`
`20`	`20`	`{`
`21`	`21`	`this.Path = path;`
	`22`	`+#pragma warning disable RS1035 // Do not use APIs banned for analyzers`
`22`	`23`	`this.LastWriteTimeUtc = File.GetLastWriteTimeUtc(path);`
	`24`	`+#pragma warning restore RS1035 // Do not use APIs banned for analyzers`
`23`	`25`
`24`	`26`	`// When using FileShare.Delete, the OS will allow the file to be deleted, but it does not disrupt`
`25`	`27`	`// our ability to read the file while our handle is open.`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,9 @@ namespace Microsoft.Windows.CsWin32;`
`21`	`21`	`[DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]`
`22`	`22`	`internal class MetadataIndex`
`23`	`23`	`{`
	`24`	`+#pragma warning disable RS1035 // Do not use APIs banned for analyzers`
`24`	`25`	`private static readonly int MaxPooledObjectCount = Math.Max(Environment.ProcessorCount, 4);`
	`26`	`+#pragma warning restore RS1035 // Do not use APIs banned for analyzers`
`25`	`27`
`26`	`28`	`private readonly MetadataFile metadataFile;`
`27`	`29`