Add net6.0 target for Linux testing

sharwell · sharwell · commit 6db9579f9447 · 2025-11-30T12:16:07.000-06:00
* Use Encoding.UTF7 instead of relying on Encoding.GetEncoding, which no
  longer supports UTF-7 on .NET 6.
* Explicitly specify reference assembly target frameworks instead of
  relying on ReferenceAssemblies.Default.
* Update to xunit 2.4.2 which is nullable-annotated.
* Fix xUnit1027 (Collection definition classes must be public)
* Fix CA1065 (Do not raise exceptions in unexpected locations)
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp10/StyleCop.Analyzers.Test.CSharp10.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp10/StyleCop.Analyzers.Test.CSharp10.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/StyleCop.Analyzers.Test.CSharp11.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/StyleCop.Analyzers.Test.CSharp11.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.4.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp12/StyleCop.Analyzers.Test.CSharp12.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp12/StyleCop.Analyzers.Test.CSharp12.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp13/StyleCop.Analyzers.Test.CSharp13.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp13/StyleCop.Analyzers.Test.CSharp13.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/StyleCop.Analyzers.Test.CSharp7.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/StyleCop.Analyzers.Test.CSharp7.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFrameworks>net46;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.8.2" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/StyleCop.Analyzers.Test.CSharp8.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/StyleCop.Analyzers.Test.CSharp8.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.6.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
 
     <!-- Increase the NuGet.Framworks version to the minimum supported by the net472 build of the testing library -->
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/StyleCop.Analyzers.Test.CSharp9.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/StyleCop.Analyzers.Test.CSharp9.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1412UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1412UnitTests.cs
@@ -19,24 +19,37 @@ namespace StyleCop.Analyzers.Test.MaintainabilityRules
 
     public class SA1412UnitTests
     {
+#if NET
+        static SA1412UnitTests()
+        {
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+        }
+#endif
+
         public static IEnumerable<object[]> NonUtf8Encodings
         {
             get
             {
                 yield return new object[] { Encoding.ASCII.CodePage };
                 yield return new object[] { Encoding.BigEndianUnicode.CodePage };
+#if NETFRAMEWORK
                 yield return new object[] { Encoding.Default.CodePage };
+#else
+                yield return new object[] { 1252 };
+#endif
                 yield return new object[] { Encoding.Unicode.CodePage };
                 yield return new object[] { Encoding.UTF32.CodePage };
+#pragma warning disable SYSLIB0001 // Type or member is obsolete
                 yield return new object[] { Encoding.UTF7.CodePage };
+#pragma warning restore SYSLIB0001 // Type or member is obsolete
             }
         }
 
         [Theory]
         [MemberData(nameof(NonUtf8Encodings))]
         public async Task TestFileWithWrongEncodingAsync(int codepage)
         {
-            var testCode = SourceText.From("class TypeName { }", Encoding.GetEncoding(codepage));
+            var testCode = SourceText.From("class TypeName { }", GetEncoding(codepage));
             var fixedCode = SourceText.From(testCode.ToString(), Encoding.UTF8);
 
             var expected = Diagnostic().WithLocation(1, 1);
@@ -88,7 +101,9 @@ public async Task TestFixAllWithMultipleEncodingsAsync()
                 {
                     SourceText.From("class Foo { }", Encoding.Unicode),
                     SourceText.From("class Bar { }", Encoding.Unicode),
+#pragma warning disable SYSLIB0001 // Type or member is obsolete
                     SourceText.From("class FooBar { }", Encoding.UTF7),
+#pragma warning restore SYSLIB0001 // Type or member is obsolete
                 },
                 ExpectedDiagnostics =
                 {
@@ -110,6 +125,18 @@ public async Task TestFixAllWithMultipleEncodingsAsync()
             await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
 
+        private static Encoding GetEncoding(int codepage)
+        {
+#pragma warning disable SYSLIB0001 // Type or member is obsolete
+            if (codepage == Encoding.UTF7.CodePage)
+            {
+                return Encoding.UTF7;
+            }
+#pragma warning restore SYSLIB0001 // Type or member is obsolete
+
+            return Encoding.GetEncoding(codepage);
+        }
+
         private async Task TestFixAllExecuterAsync(int codepage, FixAllScope scope)
         {
             // Currently unused
@@ -119,8 +146,8 @@ private async Task TestFixAllExecuterAsync(int codepage, FixAllScope scope)
             {
                 TestSources =
                 {
-                    SourceText.From("class Foo { }", Encoding.GetEncoding(codepage)),
-                    SourceText.From("class Bar { }", Encoding.GetEncoding(codepage)),
+                    SourceText.From("class Foo { }", GetEncoding(codepage)),
+                    SourceText.From("class Bar { }", GetEncoding(codepage)),
                 },
                 ExpectedDiagnostics =
                 {
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SequentialTestCollection.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SequentialTestCollection.cs
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Test
     /// Defines a collection for tests which cannot run in parallel with other tests.
     /// </summary>
     [CollectionDefinition(nameof(SequentialTestCollection), DisableParallelization = true)]
-    internal sealed class SequentialTestCollection
+    public sealed class SequentialTestCollection
     {
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFrameworks>net452;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -20,16 +20,28 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="1.3.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.2-beta1.23509.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.1.8" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="Xunit.Combinatorial" Version="1.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+    <PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.1.8" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
 
     <!-- Make sure NuGet can parse the 'net5.0' TFM -->
     <PackageReference Include="NuGet.Frameworks" Version="5.9.3" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <!-- Exclude Microsoft.Composition which is only needed for .NET Framework execution -->
+    <PackageReference Include="Microsoft.Composition" Version="1.0.31" ExcludeAssets="all" />
+
+    <!-- Make sure Windows-1252 is available for testing -->
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\StyleCop.Analyzers.CodeFixes\StyleCop.Analyzers.CodeFixes.csproj" />
     <ProjectReference Include="..\StyleCop.Analyzers\StyleCop.Analyzers.csproj" />
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/GenericAnalyzerTest.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/GenericAnalyzerTest.cs
@@ -13,14 +13,33 @@ namespace StyleCop.Analyzers.Test.Verifiers
 
     internal static class GenericAnalyzerTest
     {
-        internal static readonly ReferenceAssemblies ReferenceAssemblies;
+        private static readonly Lazy<ReferenceAssemblies> LazyReferenceAssemblies;
+
         private static readonly AnalyzerTest<DefaultVerifier> WorkspaceHelper =
             new CSharpCodeFixTest<EmptyDiagnosticAnalyzer, EmptyCodeFixProvider, DefaultVerifier>();
 
         static GenericAnalyzerTest()
+        {
+            LazyReferenceAssemblies = new Lazy<ReferenceAssemblies>(CreateDefaultReferenceAssemblies);
+        }
+
+        internal static ReferenceAssemblies ReferenceAssemblies
+        {
+            get
+            {
+                return LazyReferenceAssemblies.Value;
+            }
+        }
+
+        internal static async Task<Workspace> CreateWorkspaceAsync()
+        {
+            return await WorkspaceHelper.CreateWorkspaceAsync().ConfigureAwait(false);
+        }
+
+        private static ReferenceAssemblies CreateDefaultReferenceAssemblies()
         {
             string codeAnalysisTestVersion =
-                typeof(Compilation).Assembly.GetName().Version.Major switch
+                typeof(Compilation).Assembly.GetName().Version!.Major switch
                 {
                     1 => "1.2.1",
                     2 => "2.8.2",
@@ -52,19 +71,18 @@ static GenericAnalyzerTest()
             {
                 defaultReferenceAssemblies = ReferenceAssemblies.NetCore.NetCoreApp30;
             }
+            else if (LightupHelpers.SupportsCSharp7)
+            {
+                defaultReferenceAssemblies = ReferenceAssemblies.NetFramework.Net46.Default;
+            }
             else
             {
-                defaultReferenceAssemblies = ReferenceAssemblies.Default;
+                defaultReferenceAssemblies = ReferenceAssemblies.NetFramework.Net452.Default;
             }
 
-            ReferenceAssemblies = defaultReferenceAssemblies.AddPackages(ImmutableArray.Create(
+            return defaultReferenceAssemblies.AddPackages(ImmutableArray.Create(
                 new PackageIdentity("Microsoft.CodeAnalysis.CSharp", codeAnalysisTestVersion),
                 new PackageIdentity("System.ValueTuple", "4.5.0")));
         }
-
-        internal static async Task<Workspace> CreateWorkspaceAsync()
-        {
-            return await WorkspaceHelper.CreateWorkspaceAsync().ConfigureAwait(false);
-        }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs
@@ -110,7 +110,9 @@ static CSharpTest()
             {
                 // If we have outdated defaults from the host unit test application targeting an older .NET Framework,
                 // use more reasonable TLS protocol version for outgoing connections.
+#pragma warning disable CS0618 // Type or member is obsolete
                 if (ServicePointManager.SecurityProtocol == (SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls))
+#pragma warning restore CS0618 // Type or member is obsolete
                 {
                     ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
                 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Test`
`9`	`9`	`/// Defines a collection for tests which cannot run in parallel with other tests.`
`10`	`10`	`/// </summary>`
`11`	`11`	`[CollectionDefinition(nameof(SequentialTestCollection), DisableParallelization = true)]`
`12`		`- internal sealed class SequentialTestCollection`
	`12`	`+ public sealed class SequentialTestCollection`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`	`}`