diff --git a/appveyor.yml b/appveyor.yml index b8ace0fc..dd82465d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ image: Visual Studio 2022 environment: - CLI_CHANNEL: 8.0 + CLI_CHANNEL: 6.0.1xx install: - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" diff --git a/global.json b/global.json index c7e4561c..dffff818 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "6.0.100", "rollForward" : "latestFeature", "allowPrerelease": false } diff --git a/src/Directory.Build.props b/src/Directory.Build.props index df924d01..c48ec898 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -22,7 +22,7 @@ - + @@ -31,9 +31,9 @@ false - - - + + + diff --git a/src/nunit.analyzers.tests/DiagnosticSuppressors/AvoidUninstantiatedInternalClassesSuppressorTests.cs b/src/nunit.analyzers.tests/DiagnosticSuppressors/AvoidUninstantiatedInternalClassesSuppressorTests.cs index 1f44b734..8dbba997 100644 --- a/src/nunit.analyzers.tests/DiagnosticSuppressors/AvoidUninstantiatedInternalClassesSuppressorTests.cs +++ b/src/nunit.analyzers.tests/DiagnosticSuppressors/AvoidUninstantiatedInternalClassesSuppressorTests.cs @@ -59,7 +59,7 @@ public void OneTimeSetUp() { // Find the NetAnalyzers assembly (note version should match the one referenced) string netAnalyzersPath = Path.Combine(PathHelper.GetNuGetPackageDirectory(), - "microsoft.codeanalysis.netanalyzers/8.0.0/analyzers/dotnet/cs/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll"); + "microsoft.codeanalysis.netanalyzers/7.0.4/analyzers/dotnet/cs/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll"); Assembly netAnalyzerAssembly = Assembly.LoadFrom(netAnalyzersPath); Type analyzerType = netAnalyzerAssembly.GetType("Microsoft.CodeQuality.CSharp.Analyzers.Maintainability.CSharpAvoidUninstantiatedInternalClasses", true)!; this.analyzer = (DiagnosticAnalyzer)Activator.CreateInstance(analyzerType)!; diff --git a/src/nunit.analyzers.tests/DiagnosticSuppressors/DisposableFieldsSuppressorTests.cs b/src/nunit.analyzers.tests/DiagnosticSuppressors/DisposableFieldsSuppressorTests.cs index 0466dd11..6b1899f3 100644 --- a/src/nunit.analyzers.tests/DiagnosticSuppressors/DisposableFieldsSuppressorTests.cs +++ b/src/nunit.analyzers.tests/DiagnosticSuppressors/DisposableFieldsSuppressorTests.cs @@ -19,9 +19,9 @@ public void OneTimeSetUp() { // Find the NetAnalyzers assembly (note version should match the one referenced) string netAnalyzersPath = Path.Combine(PathHelper.GetNuGetPackageDirectory(), - "microsoft.codeanalysis.netanalyzers/8.0.0/analyzers/dotnet/cs/Microsoft.CodeAnalysis.NetAnalyzers.dll"); + "microsoft.codeanalysis.netanalyzers/7.0.4/analyzers/dotnet/cs/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll"); Assembly netAnalyzerAssembly = Assembly.LoadFrom(netAnalyzersPath); - Type analyzerType = netAnalyzerAssembly.GetType("Microsoft.CodeQuality.Analyzers.ApiDesignGuidelines.TypesThatOwnDisposableFieldsShouldBeDisposableAnalyzer", true)!; + Type analyzerType = netAnalyzerAssembly.GetType("Microsoft.CodeQuality.CSharp.Analyzers.ApiDesignGuidelines.CSharpTypesThatOwnDisposableFieldsShouldBeDisposableAnalyzer", true)!; this.analyzer = (DiagnosticAnalyzer)Activator.CreateInstance(analyzerType)!; this.analyzer = new DefaultEnabledAnalyzer(this.analyzer); diff --git a/src/nunit.analyzers.tests/Extensions/AttributeArgumentTypedConstantExtensionsTests.cs b/src/nunit.analyzers.tests/Extensions/AttributeArgumentTypedConstantExtensionsTests.cs index 22de52f6..71d2d019 100644 --- a/src/nunit.analyzers.tests/Extensions/AttributeArgumentTypedConstantExtensionsTests.cs +++ b/src/nunit.analyzers.tests/Extensions/AttributeArgumentTypedConstantExtensionsTests.cs @@ -99,7 +99,7 @@ private static IEnumerable GetTestData() SetName("CanAssignToWhenParameterIsVersionAndArgumentIsValidString"); yield return new TestCaseData("\"a.b.c.d\"", "Version", "object", Is.True). SetName("CanAssignToWhenParameterIsVersionAndArgumentIsInValidString"); -#if NET8_0_OR_GREATER +#if NET6_0_OR_GREATER yield return new TestCaseData("\"00:03:00\"", "TimeOnly", "string", Is.True). SetName("CanAssignToWhenParameterIsTimeSpanAndArgumentIsValidString"); yield return new TestCaseData("\"2020-05-08\"", "DateOnly", "string", Is.True). diff --git a/src/nunit.analyzers.tests/TestCaseUsage/TestCaseUsageAnalyzerTests.cs b/src/nunit.analyzers.tests/TestCaseUsage/TestCaseUsageAnalyzerTests.cs index a11707ac..e4abb1e1 100644 --- a/src/nunit.analyzers.tests/TestCaseUsage/TestCaseUsageAnalyzerTests.cs +++ b/src/nunit.analyzers.tests/TestCaseUsage/TestCaseUsageAnalyzerTests.cs @@ -29,7 +29,7 @@ private static IEnumerable SpecialConversions } } -#if NET8_0_OR_GREATER +#if NET6_0_OR_GREATER private static IEnumerable SpecialConversions_NET8 { get @@ -768,7 +768,7 @@ public void TestWithGenericParameter(T arg1) { } } #if NUNIT4 -#if NET8_0_OR_GREATER +#if NET6_0_OR_GREATER [Test] public void AnalyzeWhenArgumentIsCorrectGenericTypeParameter() { diff --git a/src/nunit.analyzers.tests/nunit.analyzers.tests.csproj b/src/nunit.analyzers.tests/nunit.analyzers.tests.csproj index 45b5b851..402afc2f 100644 --- a/src/nunit.analyzers.tests/nunit.analyzers.tests.csproj +++ b/src/nunit.analyzers.tests/nunit.analyzers.tests.csproj @@ -1,7 +1,7 @@ NUnit.Analyzers.Tests - net8.0;net462 + net6.0;net462 4