Skip to content

Use configured NuGet source for analyzer tests #1657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Andrew Arnott (AArnott) wants to merge 2 commits into
base: main
Choose a base branch
from
+44 −31
Open

Use configured NuGet source for analyzer tests #1657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86680e4
Use configured NuGet source for analyzer tests
AArnott Aug 24, 2026
6265a42
Retry CI after transient test failure
AArnott Aug 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion test/Microsoft.VisualStudio.Threading.Analyzers.Tests/Helpers/ReferencesHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,20 @@ internal static class ReferencesHelper
{
private static readonly string NuGetConfigPath = FindNuGetConfigPath();

/// <summary>
/// Gets the .NET 8 reference assemblies using this repository's NuGet sources.
/// </summary>
internal static readonly ReferenceAssemblies Net80References = ReferenceAssemblies.Net.Net80.WithNuGetConfigFilePath(NuGetConfigPath);

/// <summary>
/// Gets the .NET Framework 2.0 reference assemblies using this repository's NuGet sources.
/// </summary>
internal static readonly ReferenceAssemblies NetFramework20References = ReferenceAssemblies.NetFramework.Net20.Default.WithNuGetConfigFilePath(NuGetConfigPath);

#if NETFRAMEWORK
public static ReferenceAssemblies DefaultReferences = ReferenceAssemblies.NetFramework.Net471.Default
#elif NET8_0
public static ReferenceAssemblies DefaultReferences = ReferenceAssemblies.Net.Net80
public static ReferenceAssemblies DefaultReferences = Net80References
#else
#error Fix TFM conditions
#endif
Expand Down
7 changes: 4 additions & 3 deletions test/Microsoft.VisualStudio.Threading.Analyzers.Tests/VSTHRD002UseJtfRunAnalyzerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using CSVerify = Microsoft.VisualStudio.Threading.Analyzers.Tests.CSharpCodeFixVerifier<Microsoft.VisualStudio.Threading.Analyzers.VSTHRD002UseJtfRunAnalyzer, Microsoft.VisualStudio.Threading.Analyzers.VSTHRD002UseJtfRunCodeFixWithAwait>;
using ReferencesHelper = Microsoft.VisualStudio.Threading.Analyzers.Tests.ReferencesHelper;

public class VSTHRD002UseJtfRunAnalyzerTests
{
Expand Down Expand Up @@ -1272,7 +1273,7 @@ bool ReplaceFlag(ref Task<int> task) {
await new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
}.RunAsync();
}

Expand Down Expand Up @@ -1384,7 +1385,7 @@ void F(CustomWaiter waiter)
{
TestCode = test,
FixedCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net20.Default,
ReferenceAssemblies = ReferencesHelper.NetFramework20References,
};
verifyTest.TestState.AdditionalFiles.Add(("vs-threading.SyncBlockingMethods.txt", "[CustomWaiter]::Join"));
await verifyTest.RunAsync();
Expand Down Expand Up @@ -2096,7 +2097,7 @@ int DefaultInterfaceMethod(Task<int> task)
{
TestCode = test,
FixedCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
}.RunAsync();
}

Expand Down
31 changes: 16 additions & 15 deletions .../Microsoft.VisualStudio.Threading.Analyzers.Tests/VSTHRD103UseAsyncOptionAnalyzerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using static Microsoft.VisualStudio.Threading.Analyzers.VSTHRD103UseAsyncOptionAnalyzer;
using CSVerify = Microsoft.VisualStudio.Threading.Analyzers.Tests.CSharpCodeFixVerifier<Microsoft.VisualStudio.Threading.Analyzers.VSTHRD103UseAsyncOptionAnalyzer, Microsoft.VisualStudio.Threading.Analyzers.VSTHRD103UseAsyncOptionCodeFix>;
using ReferencesHelper = Microsoft.VisualStudio.Threading.Analyzers.Tests.ReferencesHelper;

public class VSTHRD103UseAsyncOptionAnalyzerTests
{
Expand Down Expand Up @@ -970,7 +971,7 @@ Task<int> GetResultAsync(Task<int> task)
await new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
}.RunAsync();
}

Expand All @@ -997,7 +998,7 @@ Task<int> GetResultAsync(Task<int> task, Task<int> otherTask)
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic(DescriptorNoAlternativeMethod).WithLocation(0).WithArguments("Result"));
await analyzerTest.RunAsync();
Expand Down Expand Up @@ -1027,7 +1028,7 @@ Task<int> GetResultAsync(Task<int> task)
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic(DescriptorNoAlternativeMethod).WithLocation(0).WithArguments("Result"));
await analyzerTest.RunAsync();
Expand Down Expand Up @@ -1057,7 +1058,7 @@ Task<int> GetResultAsync(Task<int> task)
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic(DescriptorNoAlternativeMethod).WithLocation(0).WithArguments("Result"));
await analyzerTest.RunAsync();
Expand Down Expand Up @@ -1088,7 +1089,7 @@ Task<int> GetResultAsync(Task<int> task)
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic(DescriptorNoAlternativeMethod).WithLocation(0).WithArguments("Result"));
await analyzerTest.RunAsync();
Expand Down Expand Up @@ -1121,7 +1122,7 @@ Task<int> GetResultAsync(Task<int> task, Task<int> replacement)
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic(DescriptorNoAlternativeMethod).WithLocation(0).WithArguments("Result"));
await analyzerTest.RunAsync();
Expand Down Expand Up @@ -1150,7 +1151,7 @@ Task<int> GetResultAsync(ValueTask<int> task)
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
await analyzerTest.RunAsync();
}
Expand Down Expand Up @@ -1285,7 +1286,7 @@ Task<IEnumerable<int>> GetResultAsync(Task<int> task, IEnumerable<int> items)
await new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
ExpectedDiagnostics =
{
CSVerify.Diagnostic(DescriptorNoAlternativeMethod).WithLocation(0).WithArguments("Result"),
Expand Down Expand Up @@ -1319,7 +1320,7 @@ Task<int> GetResultAsync(Task<int> task, Task<int> replacement)
await new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
ExpectedDiagnostics =
{
CSVerify.Diagnostic(DescriptorNoAlternativeMethod).WithLocation(0).WithArguments("Result"),
Expand Down Expand Up @@ -1358,7 +1359,7 @@ Task<int> GetResultAsync(Task<int> task, Task<int> replacement)
await new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
ExpectedDiagnostics =
{
CSVerify.Diagnostic(DescriptorNoAlternativeMethod).WithLocation(0).WithArguments("Result"),
Expand Down Expand Up @@ -1389,7 +1390,7 @@ Task<int> GetResultAsync(ref Task<int> task)
await new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
ExpectedDiagnostics =
{
CSVerify.Diagnostic(DescriptorNoAlternativeMethod).WithLocation(0).WithArguments("Result"),
Expand Down Expand Up @@ -1587,7 +1588,7 @@ async Task<int> GetResultAsync(ValueTask<int> task)
var verifyTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
verifyTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic(DescriptorNoAlternativeMethod).WithLocation(0).WithArguments("Result"));
await verifyTest.RunAsync();
Expand Down Expand Up @@ -1622,7 +1623,7 @@ async Task<int> GetResultAsync(ValueTask<int> task, ValueTask<int> other)
await new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
}.RunAsync();
}

Expand Down Expand Up @@ -1651,7 +1652,7 @@ async Task<int> GetResultAsync(ValueTask<int> task)
var verifyTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
verifyTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic(DescriptorNoAlternativeMethod).WithLocation(0).WithArguments("Result"));
await verifyTest.RunAsync();
Expand Down Expand Up @@ -1682,7 +1683,7 @@ async Task<int> GetResultAsync(ValueTask<int> task, ValueTask<int> copy)
var verifyTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
verifyTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic(DescriptorNoAlternativeMethod).WithLocation(0).WithArguments("Result"));
await verifyTest.RunAsync();
Expand Down
25 changes: 13 additions & 12 deletions ...icrosoft.VisualStudio.Threading.Analyzers.Tests/VSTHRD104OfferAsyncOptionAnalyzerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using CSVerify = Microsoft.VisualStudio.Threading.Analyzers.Tests.CSharpCodeFixVerifier<Microsoft.VisualStudio.Threading.Analyzers.VSTHRD104OfferAsyncOptionAnalyzer, Microsoft.CodeAnalysis.Testing.EmptyCodeFixProvider>;
using ReferencesHelper = Microsoft.VisualStudio.Threading.Analyzers.Tests.ReferencesHelper;

public class VSTHRD104OfferAsyncOptionAnalyzerTests
{
Expand Down Expand Up @@ -193,7 +194,7 @@ public int GetResult(Task<int> task) {
await new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
}.RunAsync();
}

Expand All @@ -217,7 +218,7 @@ public int GetResult(Task<int> task, Task<int> otherTask) {
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic().WithSpan(7, 25, 7, 31));
await analyzerTest.RunAsync();
Expand All @@ -243,7 +244,7 @@ public int GetResult(ValueTask<int> task) {
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic().WithSpan(7, 25, 7, 31));
await analyzerTest.RunAsync();
Expand Down Expand Up @@ -271,7 +272,7 @@ public int GetResult() {
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic().WithSpan(9, 33, 9, 39));
await analyzerTest.RunAsync();
Expand All @@ -298,7 +299,7 @@ public int GetResult(Task<int> task) {
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic().WithSpan(7, 41, 7, 47));
await analyzerTest.RunAsync();
Expand All @@ -325,7 +326,7 @@ public int GetResult(Task<int> task) {
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic().WithSpan(8, 25, 8, 31));
await analyzerTest.RunAsync();
Expand Down Expand Up @@ -355,7 +356,7 @@ private static void Replace(ref Task<int> task)
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic().WithSpan(8, 25, 8, 31));
await analyzerTest.RunAsync();
Expand Down Expand Up @@ -383,7 +384,7 @@ public int GetResult(Task<int> task) {
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic().WithSpan(9, 25, 9, 31));
await analyzerTest.RunAsync();
Expand Down Expand Up @@ -411,7 +412,7 @@ public int GetResult(Task<int> task) {
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic().WithSpan(9, 25, 9, 31));
await analyzerTest.RunAsync();
Expand Down Expand Up @@ -442,7 +443,7 @@ private static bool Replace(ref Task<int> task) {
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic().WithSpan(7, 25, 7, 31));
await analyzerTest.RunAsync();
Expand Down Expand Up @@ -470,7 +471,7 @@ public int GetResult(Task<int> task) {
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic().WithSpan(9, 26, 9, 32));
await analyzerTest.RunAsync();
Expand Down Expand Up @@ -499,7 +500,7 @@ public int GetResult(Task<int> task, Task<int> replacement) {
var analyzerTest = new CSVerify.Test
{
TestCode = test,
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferencesHelper.Net80References,
};
analyzerTest.ExpectedDiagnostics.Add(CSVerify.Diagnostic().WithSpan(8, 26, 8, 32));
await analyzerTest.RunAsync();
Expand Down
Loading