Latest dependencies

xunit · Jan 1, 2025 · ccdab0d · ccdab0d
1 parent 10484c0
commit ccdab0d
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 47 deletions.
diff --git a/NuGet.Config b/NuGet.Config
@@ -4,5 +4,7 @@
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="feedz.io/xunit/xunit" value="https://f.feedz.io/xunit/xunit/nuget/index.json" protocolVersion="3" />
+    <!-- Needed for prerelease Roslyn packages -->
+    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" protocolVersion="3" />
   </packageSources>
 </configuration>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -74,13 +74,13 @@
       </ItemGroup>
 
       <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.1" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.3-beta1.24423.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="NSubstitute" Version="5.3.0" />
         <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-        <PackageReference Include="xunit.v3.assert.source" Version="1.0.1-pre.8" />
-        <PackageReference Include="xunit.v3.core" Version="1.0.1-pre.8" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1-pre.4" />
+        <PackageReference Include="xunit.v3.assert.source" Version="1.0.1-pre.11" />
+        <PackageReference Include="xunit.v3.core" Version="1.0.1-pre.11" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1-pre.5" />
       </ItemGroup>
 
     </When>

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
@@ -2,11 +2,6 @@
 
   <PropertyGroup>
     <AssemblyName>xunit.analyzers.latest.tests.$(TargetFramework)</AssemblyName>
-    <!--
-    TODO: Temporarily disable security vulnerability detection because Microsoft.CodeAnalysis.CSharp.CodeFix.Testing
-    1.1.1 is out of date and 1.1.2 is broken.
-    -->
-    <NoWarn>$(NoWarn);NU1902;NU1903;NU1904</NoWarn>
     <OutputType>Exe</OutputType>
     <PackageId>xunit.analyzers.latest.tests</PackageId>
     <RootNamespace>Xunit.Analyzers</RootNamespace>

diff --git 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<Xunit.Suppressors.ConsiderCallingConfigureAwaitSuppressor>;
 
-#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<DiagnosticResult>();
-#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
@@ -1,15 +1,10 @@
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Testing;
 using Xunit;
 using Xunit.Analyzers;
 using Verify = CSharpVerifier<Xunit.Suppressors.MakeTypesInternalSuppressor>;
 
-#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<DiagnosticResult>();
-#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
@@ -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
@@ -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
@@ -2,11 +2,6 @@
 
   <PropertyGroup>
     <AssemblyName>xunit.analyzers.tests.$(TargetFramework)</AssemblyName>
-    <!--
-    TODO: Temporarily disable security vulnerability detection because Microsoft.CodeAnalysis.CSharp.CodeFix.Testing
-    1.1.1 is out of date and 1.1.2 is broken.
-    -->
-    <NoWarn>$(NoWarn);NU1902;NU1903;NU1904</NoWarn>
     <OutputType>Exe</OutputType>
     <PackageId>xunit.analyzers.tests</PackageId>
     <RootNamespace>Xunit.Analyzers</RootNamespace>
@@ -28,11 +23,11 @@
     <PackageDownload Include="xunit.extensibility.execution" Version="[2.9.3-pre.4]" />
     <PackageDownload Include="xunit.runner.utility" Version="[2.9.3-pre.4]" />
 
-    <PackageDownload Include="xunit.v3.assert" Version="[1.0.1-pre.8]" />
-    <PackageDownload Include="xunit.v3.common" Version="[1.0.1-pre.8]" />
-    <PackageDownload Include="xunit.v3.extensibility.core" Version="[1.0.1-pre.8]" />
-    <PackageDownload Include="xunit.v3.runner.common" Version="[1.0.1-pre.8]" />
-    <PackageDownload Include="xunit.v3.runner.utility" Version="[1.0.1-pre.8]" />
+    <PackageDownload Include="xunit.v3.assert" Version="[1.0.1-pre.11]" />
+    <PackageDownload Include="xunit.v3.common" Version="[1.0.1-pre.11]" />
+    <PackageDownload Include="xunit.v3.extensibility.core" Version="[1.0.1-pre.11]" />
+    <PackageDownload Include="xunit.v3.runner.common" Version="[1.0.1-pre.11]" />
+    <PackageDownload Include="xunit.v3.runner.utility" Version="[1.0.1-pre.11]" />
 
     <!-- Download packages referenced by CodeAnalysisNetAnalyzers -->
     <PackageDownload Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="[9.0.0-preview.24454.1]" />

diff --git a/tools/builder/build.csproj b/tools/builder/build.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageDownload Include="xunit.v3.runner.console" Version="[1.0.1-pre.8]" />
+    <PackageDownload Include="xunit.v3.runner.console" Version="[1.0.1-pre.11]" />
   </ItemGroup>
 
 </Project>
diff --git a/tools/builder/models/BuildContext.cs b/tools/builder/models/BuildContext.cs
@@ -16,7 +16,7 @@ public partial IReadOnlyList<string> 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}'");
 	}