- Use DefaultVerifier instead of NUnitVerifier in unit tests as suggested (dotnet/roslyn-sdk#1127 (comment)) to fix issues when upgrading to NUnit 4. (#61)

CodingFlow · web-flow · commit dc9dd387cd5e · 2024-06-06T17:10:01.000-04:00
- Upgrade to Nunit 4 and upgrade source generation nuget packages to latest stable versions.
diff --git a/DecoratorGenerator.UnitTests/CSharpSourceGeneratorVerifier.cs b/DecoratorGenerator.UnitTests/CSharpSourceGeneratorVerifier.cs
@@ -1,39 +1,35 @@
 ﻿using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
+using Microsoft.CodeAnalysis.Testing;
 using System.Collections.Immutable;
 
 namespace DecoratorGenerator.UnitTests;
 
 public static class CSharpSourceGeneratorVerifier<TSourceGenerator> where TSourceGenerator : ISourceGenerator, new()
 {
-    public class Test : CSharpSourceGeneratorTest<TSourceGenerator, NUnitVerifier>
+    public class Test : CSharpSourceGeneratorTest<TSourceGenerator, DefaultVerifier>
     {
-        public Test()
-        {
+        public Test() {
         }
 
-        protected override CompilationOptions CreateCompilationOptions()
-        {
+        protected override CompilationOptions CreateCompilationOptions() {
             var compilationOptions = base.CreateCompilationOptions();
             return compilationOptions.WithSpecificDiagnosticOptions(
                  compilationOptions.SpecificDiagnosticOptions.SetItems(GetNullableWarningsFromCompiler()));
         }
 
         public LanguageVersion LanguageVersion { get; set; } = LanguageVersion.Default;
 
-        private static ImmutableDictionary<string, ReportDiagnostic> GetNullableWarningsFromCompiler()
-        {
+        private static ImmutableDictionary<string, ReportDiagnostic> GetNullableWarningsFromCompiler() {
             string[] args = { "/warnaserror:nullable" };
             var commandLineArguments = CSharpCommandLineParser.Default.Parse(args, baseDirectory: Environment.CurrentDirectory, sdkDirectory: Environment.CurrentDirectory);
             var nullableWarnings = commandLineArguments.CompilationOptions.SpecificDiagnosticOptions;
 
             return nullableWarnings;
         }
 
-        protected override ParseOptions CreateParseOptions()
-        {
+        protected override ParseOptions CreateParseOptions() {
             return ((CSharpParseOptions)base.CreateParseOptions()).WithLanguageVersion(LanguageVersion);
         }
     }
diff --git a/DecoratorGenerator.UnitTests/DecoratorGenerator.UnitTests.csproj b/DecoratorGenerator.UnitTests/DecoratorGenerator.UnitTests.csproj
@@ -11,17 +11,20 @@
 
   <ItemGroup>
     <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.103.8" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.NUnit" Version="1.1.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.9.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/DecoratorGenerator/DecoratorGenerator.csproj b/DecoratorGenerator/DecoratorGenerator.csproj
@@ -53,8 +53,8 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
         <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Original file line number	Diff line number	Diff line change
`@@ -1,39 +1,35 @@`
`1`	`1`	`using Microsoft.CodeAnalysis;`
`2`	`2`	`using Microsoft.CodeAnalysis.CSharp;`
`3`	`3`	`using Microsoft.CodeAnalysis.CSharp.Testing;`
`4`		`-using Microsoft.CodeAnalysis.Testing.Verifiers;`
	`4`	`+using Microsoft.CodeAnalysis.Testing;`
`5`	`5`	`using System.Collections.Immutable;`
`6`	`6`
`7`	`7`	`namespace DecoratorGenerator.UnitTests;`
`8`	`8`
`9`	`9`	`public static class CSharpSourceGeneratorVerifier<TSourceGenerator> where TSourceGenerator : ISourceGenerator, new()`
`10`	`10`	`{`
`11`		`- public class Test : CSharpSourceGeneratorTest<TSourceGenerator, NUnitVerifier>`
	`11`	`+ public class Test : CSharpSourceGeneratorTest<TSourceGenerator, DefaultVerifier>`
`12`	`12`	`{`
`13`		`- public Test()`
`14`		`- {`
	`13`	`+ public Test() {`
`15`	`14`	`}`
`16`	`15`
`17`		`- protected override CompilationOptions CreateCompilationOptions()`
`18`		`- {`
	`16`	`+ protected override CompilationOptions CreateCompilationOptions() {`
`19`	`17`	`var compilationOptions = base.CreateCompilationOptions();`
`20`	`18`	`return compilationOptions.WithSpecificDiagnosticOptions(`
`21`	`19`	`compilationOptions.SpecificDiagnosticOptions.SetItems(GetNullableWarningsFromCompiler()));`
`22`	`20`	`}`
`23`	`21`
`24`	`22`	`public LanguageVersion LanguageVersion { get; set; } = LanguageVersion.Default;`
`25`	`23`
`26`		`- private static ImmutableDictionary<string, ReportDiagnostic> GetNullableWarningsFromCompiler()`
`27`		`- {`
	`24`	`+ private static ImmutableDictionary<string, ReportDiagnostic> GetNullableWarningsFromCompiler() {`
`28`	`25`	`string[] args = { "/warnaserror:nullable" };`
`29`	`26`	`var commandLineArguments = CSharpCommandLineParser.Default.Parse(args, baseDirectory: Environment.CurrentDirectory, sdkDirectory: Environment.CurrentDirectory);`
`30`	`27`	`var nullableWarnings = commandLineArguments.CompilationOptions.SpecificDiagnosticOptions;`
`31`	`28`
`32`	`29`	`return nullableWarnings;`
`33`	`30`	`}`
`34`	`31`
`35`		`- protected override ParseOptions CreateParseOptions()`
`36`		`- {`
	`32`	`+ protected override ParseOptions CreateParseOptions() {`
`37`	`33`	`return ((CSharpParseOptions)base.CreateParseOptions()).WithLanguageVersion(LanguageVersion);`
`38`	`34`	`}`
`39`	`35`	`}`