Fix Roslyn Issues

robotdotnet · Aug 5, 2024 · cf4f299 · cf4f299
1 parent 6db0ff8
commit cf4f299
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 25 deletions.
diff --git a/codehelp/CodeHelpers.Test/CodeHelpers.Test.csproj b/codehelp/CodeHelpers.Test/CodeHelpers.Test.csproj
@@ -11,21 +11,21 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.2-beta1.24121.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2-beta1.24121.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.2-beta1.24121.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="1.1.2-beta1.24121.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit" Version="1.1.2-beta1.24121.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit" Version="1.1.2-beta1.24121.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" Version="1.1.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing" Version="1.1.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing" Version="1.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
     <ProjectReference Include="..\CodeHelpers\WPILib.CodeHelpers.csproj" />
     <ProjectReference Include="..\..\src\stereologue\stereologue.csproj" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.8.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.10.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.10.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorFixerTest.cs b/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorFixerTest.cs
@@ -1,12 +1,11 @@
 using System.Text;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 using Microsoft.CodeAnalysis.Text;
 using Stereologue;
 using WPILib.CodeHelpers.LogGenerator.Analyzer;
 using WPILib.CodeHelpers.LogGenerator.CodeFixer;
-using Verify = Microsoft.CodeAnalysis.CSharp.Testing.XUnit.CodeFixVerifier<WPILib.CodeHelpers.LogGenerator.Analyzer.LogGeneratorAnalyzer, WPILib.CodeHelpers.LogGenerator.CodeFixer.LogGeneratorFixer>;
+using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpCodeFixVerifier<WPILib.CodeHelpers.LogGenerator.Analyzer.LogGeneratorAnalyzer, WPILib.CodeHelpers.LogGenerator.CodeFixer.LogGeneratorFixer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
 
 namespace CodeHelpers.Test.LogGenerator;
 
@@ -35,7 +34,7 @@ public partial class MyNewClass
 }
 ";
 
-        await new CSharpCodeFixTest<LogGeneratorAnalyzer, LogGeneratorFixer, XUnitVerifier>()
+        await new CSharpCodeFixTest<LogGeneratorAnalyzer, LogGeneratorFixer, DefaultVerifier>()
         {
             TestState = {
                 AdditionalReferences = {

diff --git a/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTest.cs b/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTest.cs
@@ -4,7 +4,6 @@ namespace CodeHelpers.Test.LogGenerator;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 using Microsoft.CodeAnalysis.Text;
 using Stereologue;
 using WPILib.CodeHelpers.LogGenerator.SourceGenerator;
@@ -44,7 +43,7 @@ public void UpdateStereologue(string path, global::Stereologue.Stereologuer logg
         expected = expected.NormalizeLineEndings();
         expected = expected.Replace("REPLACEME", output);
 
-        await new CSharpSourceGeneratorTest<LogGeneratorSharp, XUnitVerifier>()
+        await new CSharpSourceGeneratorTest<LogGeneratorSharp, DefaultVerifier>()
         {
             TestState = {
                 AdditionalReferences = {

diff --git a/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTestVb.cs b/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTestVb.cs
@@ -3,7 +3,6 @@ namespace CodeHelpers.Test.LogGenerator;
 using System.Text;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis.VisualBasic.Testing;
 using Stereologue;
@@ -44,7 +43,7 @@ End Class
         expected = expected.NormalizeLineEndings();
         expected = expected.Replace("REPLACEME", output);
 
-        await new VisualBasicSourceGeneratorTest<LogGeneratorVb, XUnitVerifier>()
+        await new VisualBasicSourceGeneratorTest<LogGeneratorVb, DefaultVerifier>()
         {
             TestState = {
                 AdditionalReferences = {

diff --git a/codehelp/CodeHelpers/WPILib.CodeHelpers.csproj b/codehelp/CodeHelpers/WPILib.CodeHelpers.csproj
@@ -22,17 +22,17 @@
     <!-- Include enums used in attributes -->
 
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.10.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.10.0" PrivateAssets="all" />
     <PackageReference Include="PolySharp" Version="1.14.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.4" PrivateAssets="All" />
   </ItemGroup>
 
   <!-- This ensures the library will be packaged as a source generator when we use `dotnet pack` -->

diff --git a/src/wpiutil/Logging/DataLog.cs b/src/wpiutil/Logging/DataLog.cs
@@ -8,7 +8,8 @@ namespace WPIUtil.Logging;
 
 public unsafe class DataLog : IDisposable
 {
-    protected DataLog(OpaqueDataLog* impl) {
+    protected DataLog(OpaqueDataLog* impl)
+    {
         NativeHandle = impl;
     }
 
@@ -192,5 +193,5 @@ private void AddSchemaImpl(IStructBase value, long timestamp, HashSet<string> se
     }
 
     private readonly ConcurrentDictionary<string, int> m_schemaMap = [];
-    public unsafe OpaqueDataLog* NativeHandle { get; protected init;}
+    public unsafe OpaqueDataLog* NativeHandle { get; protected init; }
 }
diff --git a/src/wpiutil/Logging/DataLogBackgroundWriter.cs b/src/wpiutil/Logging/DataLogBackgroundWriter.cs
@@ -21,7 +21,8 @@ private static void NativeDataLogCallback(void* ptr, byte* data, nuint len)
 
     public delegate void DataLogCallback(ReadOnlySpan<byte> data);
 
-    public DataLogBackgroundWriter(string dir = "", string filename = "", double period = 0.25, string extraHeader = "") : base(DataLogNative.CreateBg(dir, filename, period, extraHeader)) {
+    public DataLogBackgroundWriter(string dir = "", string filename = "", double period = 0.25, string extraHeader = "") : base(DataLogNative.CreateBg(dir, filename, period, extraHeader))
+    {
 
     }
 
@@ -35,7 +36,8 @@ public DataLogBackgroundWriter(DataLogCallback callback, double period = 0.25, s
     public override void Dispose()
     {
         base.Dispose();
-        if (gcHandle.HasValue) {
+        if (gcHandle.HasValue)
+        {
             gcHandle.Value.Free();
         }
     }

diff --git a/src/wpiutil/Logging/DataLogWriter.cs b/src/wpiutil/Logging/DataLogWriter.cs
@@ -4,6 +4,7 @@ namespace WPIUtil.Logging;
 
 public unsafe class DataLogWriter : DataLog
 {
-    public DataLogWriter(string filename, string extraHeader = "") : base(DataLogNative.Create(filename, extraHeader)) {
+    public DataLogWriter(string filename, string extraHeader = "") : base(DataLogNative.Create(filename, extraHeader))
+    {
     }
 }