Skip to content

Commit cf4f299

Browse files
ThadHouseThadHouse
committed
Fix Roslyn Issues
1 parent 6db0ff8 commit cf4f299

File tree

8 files changed

+26
-25
lines changed

8 files changed

+26
-25
lines changed

‎codehelp/CodeHelpers.Test/CodeHelpers.Test.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="coverlet.collector" Version="6.0.0" />
14-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.2-beta1.24121.1" />
15-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2-beta1.24121.1" />
16-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.2-beta1.24121.1" />
17-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="1.1.2-beta1.24121.1" />
18-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit" Version="1.1.2-beta1.24121.1" />
19-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit" Version="1.1.2-beta1.24121.1" />
14+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
15+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
16+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
17+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" Version="1.1.2" />
18+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing" Version="1.1.2" />
19+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing" Version="1.1.2" />
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
2121
<PackageReference Include="xunit" Version="2.4.2" />
2222
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
2323
<ProjectReference Include="..\CodeHelpers\WPILib.CodeHelpers.csproj" />
2424
<ProjectReference Include="..\..\src\stereologue\stereologue.csproj" />
2525
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
26-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
27-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.8.0" />
28-
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" />
26+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
27+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.10.0" />
28+
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.10.0" />
2929
</ItemGroup>
3030

3131
<ItemGroup>

‎codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorFixerTest.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System.Text;
22
using Microsoft.CodeAnalysis.CSharp.Testing;
33
using Microsoft.CodeAnalysis.Testing;
4-
using Microsoft.CodeAnalysis.Testing.Verifiers;
54
using Microsoft.CodeAnalysis.Text;
65
using Stereologue;
76
using WPILib.CodeHelpers.LogGenerator.Analyzer;
87
using WPILib.CodeHelpers.LogGenerator.CodeFixer;
9-
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.XUnit.CodeFixVerifier<WPILib.CodeHelpers.LogGenerator.Analyzer.LogGeneratorAnalyzer, WPILib.CodeHelpers.LogGenerator.CodeFixer.LogGeneratorFixer>;
8+
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpCodeFixVerifier<WPILib.CodeHelpers.LogGenerator.Analyzer.LogGeneratorAnalyzer, WPILib.CodeHelpers.LogGenerator.CodeFixer.LogGeneratorFixer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
109

1110
namespace CodeHelpers.Test.LogGenerator;
1211

@@ -35,7 +34,7 @@ public partial class MyNewClass
3534
}
3635
";
3736

38-
await new CSharpCodeFixTest<LogGeneratorAnalyzer, LogGeneratorFixer, XUnitVerifier>()
37+
await new CSharpCodeFixTest<LogGeneratorAnalyzer, LogGeneratorFixer, DefaultVerifier>()
3938
{
4039
TestState = {
4140
AdditionalReferences = {

‎codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTest.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ namespace CodeHelpers.Test.LogGenerator;
44
using Microsoft.CodeAnalysis;
55
using Microsoft.CodeAnalysis.CSharp.Testing;
66
using Microsoft.CodeAnalysis.Testing;
7-
using Microsoft.CodeAnalysis.Testing.Verifiers;
87
using Microsoft.CodeAnalysis.Text;
98
using Stereologue;
109
using WPILib.CodeHelpers.LogGenerator.SourceGenerator;
@@ -44,7 +43,7 @@ public void UpdateStereologue(string path, global::Stereologue.Stereologuer logg
4443
expected = expected.NormalizeLineEndings();
4544
expected = expected.Replace("REPLACEME", output);
4645

47-
await new CSharpSourceGeneratorTest<LogGeneratorSharp, XUnitVerifier>()
46+
await new CSharpSourceGeneratorTest<LogGeneratorSharp, DefaultVerifier>()
4847
{
4948
TestState = {
5049
AdditionalReferences = {

‎codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTestVb.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ namespace CodeHelpers.Test.LogGenerator;
33
using System.Text;
44
using Microsoft.CodeAnalysis;
55
using Microsoft.CodeAnalysis.Testing;
6-
using Microsoft.CodeAnalysis.Testing.Verifiers;
76
using Microsoft.CodeAnalysis.Text;
87
using Microsoft.CodeAnalysis.VisualBasic.Testing;
98
using Stereologue;
@@ -44,7 +43,7 @@ End Class
4443
expected = expected.NormalizeLineEndings();
4544
expected = expected.Replace("REPLACEME", output);
4645

47-
await new VisualBasicSourceGeneratorTest<LogGeneratorVb, XUnitVerifier>()
46+
await new VisualBasicSourceGeneratorTest<LogGeneratorVb, DefaultVerifier>()
4847
{
4948
TestState = {
5049
AdditionalReferences = {

‎codehelp/CodeHelpers/WPILib.CodeHelpers.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
<!-- Include enums used in attributes -->
2323

2424
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
25-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
26-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.8.0" PrivateAssets="all" />
27-
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" PrivateAssets="all" />
25+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" PrivateAssets="all" />
26+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.10.0" PrivateAssets="all" />
27+
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.10.0" PrivateAssets="all" />
2828
<PackageReference Include="PolySharp" Version="1.14.1">
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
<PrivateAssets>all</PrivateAssets>
3131
</PackageReference>
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All" />
35+
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.4" PrivateAssets="All" />
3636
</ItemGroup>
3737

3838
<!-- This ensures the library will be packaged as a source generator when we use `dotnet pack` -->

‎src/wpiutil/Logging/DataLog.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ namespace WPIUtil.Logging;
88

99
public unsafe class DataLog : IDisposable
1010
{
11-
protected DataLog(OpaqueDataLog* impl) {
11+
protected DataLog(OpaqueDataLog* impl)
12+
{
1213
NativeHandle = impl;
1314
}
1415

@@ -192,5 +193,5 @@ private void AddSchemaImpl(IStructBase value, long timestamp, HashSet<string> se
192193
}
193194

194195
private readonly ConcurrentDictionary<string, int> m_schemaMap = [];
195-
public unsafe OpaqueDataLog* NativeHandle { get; protected init;}
196+
public unsafe OpaqueDataLog* NativeHandle { get; protected init; }
196197
}

‎src/wpiutil/Logging/DataLogBackgroundWriter.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ private static void NativeDataLogCallback(void* ptr, byte* data, nuint len)
2121

2222
public delegate void DataLogCallback(ReadOnlySpan<byte> data);
2323

24-
public DataLogBackgroundWriter(string dir = "", string filename = "", double period = 0.25, string extraHeader = "") : base(DataLogNative.CreateBg(dir, filename, period, extraHeader)) {
24+
public DataLogBackgroundWriter(string dir = "", string filename = "", double period = 0.25, string extraHeader = "") : base(DataLogNative.CreateBg(dir, filename, period, extraHeader))
25+
{
2526

2627
}
2728

@@ -35,7 +36,8 @@ public DataLogBackgroundWriter(DataLogCallback callback, double period = 0.25, s
3536
public override void Dispose()
3637
{
3738
base.Dispose();
38-
if (gcHandle.HasValue) {
39+
if (gcHandle.HasValue)
40+
{
3941
gcHandle.Value.Free();
4042
}
4143
}

‎src/wpiutil/Logging/DataLogWriter.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ namespace WPIUtil.Logging;
44

55
public unsafe class DataLogWriter : DataLog
66
{
7-
public DataLogWriter(string filename, string extraHeader = "") : base(DataLogNative.Create(filename, extraHeader)) {
7+
public DataLogWriter(string filename, string extraHeader = "") : base(DataLogNative.Create(filename, extraHeader))
8+
{
89
}
910
}

0 commit comments

Comments
 (0)