Skip to content

Commit ae9d1b9

Browse files
sailrosailro
committed
Move to .net 9
1 parent 6bbfa4f commit ae9d1b9

8 files changed

+39
-30
lines changed

‎.github/workflows/main.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,15 @@ jobs:
1414
windows:
1515
runs-on: windows-latest
1616
steps:
17-
- uses: actions/checkout@v1
17+
- uses: actions/checkout@v2
18+
19+
- name: Setup .NET
20+
uses: actions/setup-dotnet@v4
21+
with:
22+
dotnet-version: 9.0.x
23+
1824
- name: Build
1925
run: dotnet build -c Debug PrimaryConstructorAnalyzer.Test/PrimaryConstructorAnalyzer.Test.csproj
26+
2027
- name: Test
2128
run: dotnet test --no-build -c Debug PrimaryConstructorAnalyzer.Test/PrimaryConstructorAnalyzer.Test.csproj

‎Directory.Packages.props

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
<Project>
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
45
</PropertyGroup>
56
<ItemGroup>
6-
<GlobalPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0" />
7-
<GlobalPackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14" />
7+
<GlobalPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.11.0" />
8+
<GlobalPackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19" />
89
</ItemGroup>
910
<ItemGroup>
10-
<PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
11-
<PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
12-
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.8.0" />
13-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
14-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
15-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest" Version="1.1.1" />
16-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest" Version="1.1.1" />
17-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest" Version="1.1.1" />
18-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
11+
<PackageVersion Include="MSTest.TestAdapter" Version="3.6.3" />
12+
<PackageVersion Include="MSTest.TestFramework" Version="3.6.3" />
13+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.11.0" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
15+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
16+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest" Version="1.1.2" />
17+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest" Version="1.1.2" />
18+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest" Version="1.1.2" />
19+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
1920
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
20-
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.7.2196" />
21+
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.12.2069" />
22+
<!-- Security overrides -->
23+
<PackageVersion Include="System.Formats.Asn1" Version="9.0.0" />
2124
</ItemGroup>
2225
</Project>

‎PrimaryConstructorAnalyzer.Test/PrimaryConstructorAnalyzer.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55

66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
77
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>

‎PrimaryConstructorAnalyzer.Test/PrimaryConstructorAnalyzerUnitTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Microsoft.VisualStudio.TestTools.UnitTesting;
2-
using VerifyCS = PrimaryConstructorAnalyzer.Test.CSharpAnalyzerVerifier<PrimaryConstructorAnalyzer.PrimaryConstructorParameterMutationAnalyzer>;
2+
using VerifyCS = PrimaryConstructorAnalyzer.Test.Verifiers.CSharpAnalyzerVerifier<PrimaryConstructorAnalyzer.PrimaryConstructorParameterMutationAnalyzer>;
33

44
namespace PrimaryConstructorAnalyzer.Test;
55

‎PrimaryConstructorAnalyzer.Test/Verifiers/CSharpAnalyzerVerifier.Test.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
using Microsoft.CodeAnalysis.CSharp.Testing;
22
using Microsoft.CodeAnalysis.Diagnostics;
3-
using Microsoft.CodeAnalysis.Testing.Verifiers;
3+
using Microsoft.CodeAnalysis.Testing;
44
using Microsoft.VisualStudio.TestTools.UnitTesting;
55

6-
namespace PrimaryConstructorAnalyzer.Test;
6+
namespace PrimaryConstructorAnalyzer.Test.Verifiers;
77

88
public static partial class CSharpAnalyzerVerifier<TAnalyzer> where TAnalyzer : DiagnosticAnalyzer, new()
99
{
10-
public class Test : CSharpAnalyzerTest<TAnalyzer, MSTestVerifier>
10+
public class Test : CSharpAnalyzerTest<TAnalyzer, DefaultVerifier>
1111
{
1212
public Test()
1313
{

‎PrimaryConstructorAnalyzer.Test/Verifiers/CSharpAnalyzerVerifier.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
using Microsoft.CodeAnalysis.CSharp.Testing;
33
using Microsoft.CodeAnalysis.Diagnostics;
44
using Microsoft.CodeAnalysis.Testing;
5-
using Microsoft.CodeAnalysis.Testing.Verifiers;
65

7-
namespace PrimaryConstructorAnalyzer.Test;
6+
namespace PrimaryConstructorAnalyzer.Test.Verifiers;
87

98
public static partial class CSharpAnalyzerVerifier<TAnalyzer> where TAnalyzer : DiagnosticAnalyzer, new()
109
{
11-
public static DiagnosticResult Diagnostic() => CSharpAnalyzerVerifier<TAnalyzer, MSTestVerifier>.Diagnostic();
12-
public static DiagnosticResult Diagnostic(string diagnosticId) => CSharpAnalyzerVerifier<TAnalyzer, MSTestVerifier>.Diagnostic(diagnosticId);
13-
public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor) => CSharpAnalyzerVerifier<TAnalyzer, MSTestVerifier>.Diagnostic(descriptor);
10+
public static DiagnosticResult Diagnostic() => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic();
11+
public static DiagnosticResult Diagnostic(string diagnosticId) => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic(diagnosticId);
12+
public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor) => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic(descriptor);
1413

1514
public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
1615
{

‎PrimaryConstructorAnalyzer.Test/Verifiers/CSharpVerifierHelper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Microsoft.CodeAnalysis.CSharp;
33
using System.Collections.Immutable;
44

5-
namespace PrimaryConstructorAnalyzer.Test;
5+
namespace PrimaryConstructorAnalyzer.Test.Verifiers;
66

77
internal static class CSharpVerifierHelper
88
{

‎PrimaryConstructorAnalyzer/PrimaryConstructorParameterMutationAnalyzer.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ public class PrimaryConstructorParameterMutationAnalyzer : DiagnosticAnalyzer
1313
{
1414
public const string DiagnosticId = "PCA0001";
1515

16-
private static readonly LocalizableString Title = new LocalizableResourceString(nameof(Resources.AnalyzerTitle), Resources.ResourceManager, typeof(Resources));
17-
private static readonly LocalizableString MessageFormat = new LocalizableResourceString(nameof(Resources.AnalyzerMessageFormat), Resources.ResourceManager, typeof(Resources));
18-
private static readonly LocalizableString Description = new LocalizableResourceString(nameof(Resources.AnalyzerDescription), Resources.ResourceManager, typeof(Resources));
19-
private const string Category = "Mutability";
16+
public static readonly LocalizableString Title = new LocalizableResourceString(nameof(Resources.AnalyzerTitle), Resources.ResourceManager, typeof(Resources));
17+
public static readonly LocalizableString MessageFormat = new LocalizableResourceString(nameof(Resources.AnalyzerMessageFormat), Resources.ResourceManager, typeof(Resources));
18+
public static readonly LocalizableString Description = new LocalizableResourceString(nameof(Resources.AnalyzerDescription), Resources.ResourceManager, typeof(Resources));
19+
public const string Category = "Mutability";
2020

21-
private static readonly DiagnosticDescriptor Rule = new(DiagnosticId, Title, MessageFormat, Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description);
21+
public static readonly DiagnosticDescriptor Rule = new(DiagnosticId, Title, MessageFormat, Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description);
2222

23-
public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
23+
public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => [Rule];
2424

2525
public override void Initialize(AnalysisContext context)
2626
{

0 commit comments

Comments
 (0)