diff --git a/NuGet.Config b/NuGet.Config index 49cb6a36..bad695c9 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -4,5 +4,7 @@ + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 82c2774d..8263a455 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -74,13 +74,13 @@ - + - - - + + + diff --git a/src/compat/xunit.analyzers.latest.tests/xunit.analyzers.latest.tests.csproj b/src/compat/xunit.analyzers.latest.tests/xunit.analyzers.latest.tests.csproj index ae2f2e42..0f2e7dfa 100644 --- a/src/compat/xunit.analyzers.latest.tests/xunit.analyzers.latest.tests.csproj +++ b/src/compat/xunit.analyzers.latest.tests/xunit.analyzers.latest.tests.csproj @@ -2,11 +2,6 @@ xunit.analyzers.latest.tests.$(TargetFramework) - - $(NoWarn);NU1902;NU1903;NU1904 Exe xunit.analyzers.latest.tests Xunit.Analyzers diff --git a/src/xunit.analyzers.tests/Suppressors/ConsiderCallingConfigureAwaitSuppressorTests.cs b/src/xunit.analyzers.tests/Suppressors/ConsiderCallingConfigureAwaitSuppressorTests.cs index 2391f27b..1af0d1b5 100644 --- a/src/xunit.analyzers.tests/Suppressors/ConsiderCallingConfigureAwaitSuppressorTests.cs +++ b/src/xunit.analyzers.tests/Suppressors/ConsiderCallingConfigureAwaitSuppressorTests.cs @@ -5,10 +5,6 @@ using Xunit.Analyzers; using Verify = CSharpVerifier; -#if ROSLYN_LATEST -using System; -#endif - public sealed class ConsiderCallingConfigureAwaitSuppressorTests { [Fact] @@ -45,11 +41,7 @@ public async Task TestMethod() {{ }} }} """, attribute); -#if ROSLYN_LATEST - var expected = Array.Empty(); -#else var expected = DiagnosticResult.CompilerWarning("CA2007").WithLocation(0).WithIsSuppressed(true); -#endif await Verify.VerifySuppressor(code, CodeAnalysisNetAnalyzers.CA2007(), expected); } diff --git a/src/xunit.analyzers.tests/Suppressors/MakeTypesInternalSuppressorTests.cs b/src/xunit.analyzers.tests/Suppressors/MakeTypesInternalSuppressorTests.cs index 72f5d8fa..6304002f 100644 --- a/src/xunit.analyzers.tests/Suppressors/MakeTypesInternalSuppressorTests.cs +++ b/src/xunit.analyzers.tests/Suppressors/MakeTypesInternalSuppressorTests.cs @@ -1,15 +1,10 @@ using System.Threading.Tasks; +using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Testing; using Xunit; using Xunit.Analyzers; using Verify = CSharpVerifier; -#if ROSLYN_LATEST -using System; -#else -using Microsoft.CodeAnalysis; -#endif - public sealed class MakeTypesInternalSuppressorTests { [Fact] @@ -43,11 +38,7 @@ public class {{|#0:TestClass|}} {{ public void TestMethod() {{ }} }} """, attribute); -#if ROSLYN_LATEST - var expected = Array.Empty(); -#else var expected = new DiagnosticResult("CA1515", DiagnosticSeverity.Warning).WithLocation(0).WithIsSuppressed(true); -#endif await Verify.VerifySuppressor(code, CodeAnalysisNetAnalyzers.CA1515(), expected); } diff --git a/src/xunit.analyzers.tests/Suppressors/UseAsyncSuffixForAsyncMethodsSuppressorTests.cs b/src/xunit.analyzers.tests/Suppressors/UseAsyncSuffixForAsyncMethodsSuppressorTests.cs index eed998b1..6502241e 100644 --- a/src/xunit.analyzers.tests/Suppressors/UseAsyncSuffixForAsyncMethodsSuppressorTests.cs +++ b/src/xunit.analyzers.tests/Suppressors/UseAsyncSuffixForAsyncMethodsSuppressorTests.cs @@ -28,9 +28,7 @@ public class TestClass { var expected = new[] { new DiagnosticResult("VSTHRD200", DiagnosticSeverity.Warning).WithLocation(0), -#if !ROSLYN_LATEST new DiagnosticResult("VSTHRD200", DiagnosticSeverity.Warning).WithLocation(1).WithIsSuppressed(true), -#endif }; await Verify.VerifySuppressor(code, VsThreadingAnalyzers.VSTHRD200(), expected); diff --git a/src/xunit.analyzers.tests/Utility/CodeAnalyzerHelper.cs b/src/xunit.analyzers.tests/Utility/CodeAnalyzerHelper.cs index d3fa4633..4a76dc1d 100644 --- a/src/xunit.analyzers.tests/Utility/CodeAnalyzerHelper.cs +++ b/src/xunit.analyzers.tests/Utility/CodeAnalyzerHelper.cs @@ -61,10 +61,10 @@ static CodeAnalyzerHelper() new PackageIdentity("Microsoft.Extensions.Primitives", "8.0.0"), new PackageIdentity("System.Threading.Tasks.Extensions", "4.5.4"), new PackageIdentity("System.Text.Json", "8.0.0"), - new PackageIdentity("xunit.v3.assert", "1.0.1-pre.8"), - new PackageIdentity("xunit.v3.common", "1.0.1-pre.8"), - new PackageIdentity("xunit.v3.extensibility.core", "1.0.1-pre.8"), - new PackageIdentity("xunit.v3.runner.common", "1.0.1-pre.8") + new PackageIdentity("xunit.v3.assert", "1.0.1-pre.11"), + new PackageIdentity("xunit.v3.common", "1.0.1-pre.11"), + new PackageIdentity("xunit.v3.extensibility.core", "1.0.1-pre.11"), + new PackageIdentity("xunit.v3.runner.common", "1.0.1-pre.11") ) ); @@ -74,8 +74,8 @@ static CodeAnalyzerHelper() new PackageIdentity("Microsoft.Extensions.Primitives", "8.0.0"), new PackageIdentity("System.Threading.Tasks.Extensions", "4.5.4"), new PackageIdentity("System.Text.Json", "8.0.0"), - new PackageIdentity("xunit.v3.common", "1.0.1-pre.8"), - new PackageIdentity("xunit.v3.runner.utility", "1.0.1-pre.8") + new PackageIdentity("xunit.v3.common", "1.0.1-pre.11"), + new PackageIdentity("xunit.v3.runner.utility", "1.0.1-pre.11") ) ); } diff --git a/src/xunit.analyzers.tests/xunit.analyzers.tests.csproj b/src/xunit.analyzers.tests/xunit.analyzers.tests.csproj index 187416d1..b9f0ed4a 100644 --- a/src/xunit.analyzers.tests/xunit.analyzers.tests.csproj +++ b/src/xunit.analyzers.tests/xunit.analyzers.tests.csproj @@ -2,11 +2,6 @@ xunit.analyzers.tests.$(TargetFramework) - - $(NoWarn);NU1902;NU1903;NU1904 Exe xunit.analyzers.tests Xunit.Analyzers @@ -28,11 +23,11 @@ - - - - - + + + + + diff --git a/tools/builder/build.csproj b/tools/builder/build.csproj index aa584bdb..b5c080fe 100644 --- a/tools/builder/build.csproj +++ b/tools/builder/build.csproj @@ -16,7 +16,7 @@ - + diff --git a/tools/builder/models/BuildContext.cs b/tools/builder/models/BuildContext.cs index e2a113bc..23909084 100644 --- a/tools/builder/models/BuildContext.cs +++ b/tools/builder/models/BuildContext.cs @@ -16,7 +16,7 @@ public partial IReadOnlyList GetSkippedAnalysisFolders() => partial void Initialize() { - consoleRunner = Path.Combine(NuGetPackageCachePath, "xunit.v3.runner.console", "1.0.1-pre.8", "tools", "net472", "xunit.v3.runner.console.exe"); + consoleRunner = Path.Combine(NuGetPackageCachePath, "xunit.v3.runner.console", "1.0.1-pre.11", "tools", "net472", "xunit.v3.runner.console.exe"); if (!File.Exists(consoleRunner)) throw new InvalidOperationException($"Cannot find console runner at '{consoleRunner}'"); }