Skip to content
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

Jump to bottom

Remove framework specific packages #1144

Merged
merged 4 commits into from
Aug 12, 2024
Merged

Remove framework specific packages #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
403f0f7
Remove xunit specific packages
sharwell Jan 31, 2024
30396fb
Remove all framework specific packages
sharwell Feb 15, 2024
a7b325a
Merge remote-tracking branch 'dotnet/main' into no-xunit
sharwell Jul 22, 2024
21c2fb7
Remove unnecessary IVTs
sharwell Jul 22, 2024
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
380 changes: 1 addition & 379 deletions Roslyn-SDK.sln
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions samples/CSharp/Analyzers/Analyzers.Test/Analyzers.CSharp.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/CSharp/Analyzers/Analyzers.Test/Tests/CodeBlockAnalyzerUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Testing;
using Xunit;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.XUnit.AnalyzerVerifier<Sample.Analyzers.CodeBlockAnalyzer>;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Sample.Analyzers.CodeBlockAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;

namespace Sample.Analyzers.Test
{
Expand Down
2 changes: 1 addition & 1 deletion samples/CSharp/Analyzers/Analyzers.Test/Tests/CodeBlockStartedAnalyzerUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Testing;
using Xunit;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.XUnit.AnalyzerVerifier<Sample.Analyzers.CodeBlockStartedAnalyzer>;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Sample.Analyzers.CodeBlockStartedAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;

namespace Sample.Analyzers.Test
{
Expand Down
7 changes: 3 additions & 4 deletions samples/CSharp/Analyzers/Analyzers.Test/Tests/CompilationAnalyzerUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Testing;
using Microsoft.CodeAnalysis.Testing;
using Microsoft.CodeAnalysis.Testing.Verifiers;
using Xunit;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.XUnit.AnalyzerVerifier<Sample.Analyzers.CompilationAnalyzer>;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Sample.Analyzers.CompilationAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;

namespace Sample.Analyzers.Test
{
Expand All @@ -28,7 +27,7 @@ public void M()
KeyValuePair<string, ReportDiagnostic> specificOption =
new KeyValuePair<string, ReportDiagnostic>(DiagnosticIds.SymbolAnalyzerRuleId, ReportDiagnostic.Error);

await new CSharpAnalyzerTest<CompilationAnalyzer, XUnitVerifier>
await new CSharpAnalyzerTest<CompilationAnalyzer, DefaultVerifier>
{
TestCode = test,
ExpectedDiagnostics =
Expand All @@ -48,7 +47,7 @@ public void M()
}.RunAsync();

specificOption = new KeyValuePair<string, ReportDiagnostic>(DiagnosticIds.SymbolAnalyzerRuleId, ReportDiagnostic.Suppress);
await new CSharpAnalyzerTest<CompilationAnalyzer, XUnitVerifier>
await new CSharpAnalyzerTest<CompilationAnalyzer, DefaultVerifier>
{
TestCode = test,
ExpectedDiagnostics =
Expand Down
2 changes: 1 addition & 1 deletion samples/CSharp/Analyzers/Analyzers.Test/Tests/CompilationStartedAnalyzerUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Testing;
using Xunit;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.XUnit.AnalyzerVerifier<Sample.Analyzers.CompilationStartedAnalyzer>;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Sample.Analyzers.CompilationStartedAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;

namespace Sample.Analyzers.Test
{
Expand Down
2 changes: 1 addition & 1 deletion ...rs/Analyzers.Test/Tests/CompilationStartedAnalyzerWithCompilationWideAnalysisUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Testing;
using Xunit;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.XUnit.AnalyzerVerifier<Sample.Analyzers.CompilationStartedAnalyzerWithCompilationWideAnalysis>;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Sample.Analyzers.CompilationStartedAnalyzerWithCompilationWideAnalysis, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;

namespace Sample.Analyzers.Test
{
Expand Down
2 changes: 1 addition & 1 deletion samples/CSharp/Analyzers/Analyzers.Test/Tests/SemanticModelAnalyzerUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Testing;
using Xunit;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.XUnit.AnalyzerVerifier<Sample.Analyzers.SemanticModelAnalyzer>;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Sample.Analyzers.SemanticModelAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;

namespace Sample.Analyzers.Test
{
Expand Down
2 changes: 1 addition & 1 deletion samples/CSharp/Analyzers/Analyzers.Test/Tests/SymbolAnalyzerUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Testing;
using Xunit;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.XUnit.AnalyzerVerifier<Sample.Analyzers.SymbolAnalyzer>;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Sample.Analyzers.SymbolAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;

namespace Sample.Analyzers.Test
{
Expand Down
2 changes: 1 addition & 1 deletion samples/CSharp/Analyzers/Analyzers.Test/Tests/SyntaxNodeAnalyzerUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Testing;
using Xunit;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.XUnit.AnalyzerVerifier<Sample.Analyzers.SyntaxNodeAnalyzer>;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Sample.Analyzers.SyntaxNodeAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;

namespace Sample.Analyzers.Test
{
Expand Down
9 changes: 4 additions & 5 deletions samples/CSharp/Analyzers/Analyzers.Test/Tests/SyntaxTreeAnalyzerUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Testing;
using Microsoft.CodeAnalysis.Testing;
using Microsoft.CodeAnalysis.Testing.Verifiers;
using Xunit;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.XUnit.AnalyzerVerifier<Sample.Analyzers.SyntaxTreeAnalyzer>;
using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Sample.Analyzers.SyntaxTreeAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;

namespace Sample.Analyzers.Test
{
Expand All @@ -25,7 +24,7 @@ public void M()
}";
DiagnosticResult expected = Verify.Diagnostic().WithArguments("Test0.cs");

await new CSharpAnalyzerTest<SyntaxTreeAnalyzer, XUnitVerifier>
await new CSharpAnalyzerTest<SyntaxTreeAnalyzer, DefaultVerifier>
{
TestCode = test,
SolutionTransforms =
Expand All @@ -38,7 +37,7 @@ public void M()
}
}.RunAsync();

await new CSharpAnalyzerTest<SyntaxTreeAnalyzer, XUnitVerifier>
await new CSharpAnalyzerTest<SyntaxTreeAnalyzer, DefaultVerifier>
{
TestCode = test,
ExpectedDiagnostics = { expected },
Expand All @@ -52,7 +51,7 @@ public void M()
}
}.RunAsync();

await new CSharpAnalyzerTest<SyntaxTreeAnalyzer, XUnitVerifier>
await new CSharpAnalyzerTest<SyntaxTreeAnalyzer, DefaultVerifier>
{
TestCode = test,
ExpectedDiagnostics = { expected },
Expand Down
4 changes: 2 additions & 2 deletions samples/VisualBasic/MakeConst/MakeConst.Test/MakeConst.VisualBasic.UnitTests.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/VisualBasic/MakeConst/MakeConst.Test/MakeConstUnitTests.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Imports Xunit
Imports Verify = Microsoft.CodeAnalysis.VisualBasic.Testing.XUnit.CodeFixVerifier(Of MakeConst.VisualBasic.MakeConstAnalyzer, MakeConst.VisualBasic.MakeConstCodeFixProvider)
Imports Verify = Microsoft.CodeAnalysis.VisualBasic.Testing.VisualBasicCodeFixVerifier(Of MakeConst.VisualBasic.MakeConstAnalyzer, MakeConst.VisualBasic.MakeConstCodeFixProvider, Microsoft.CodeAnalysis.Testing.DefaultVerifier)

Namespace MakeConst.Test
Public Class UnitTest
Expand Down
32 changes: 0 additions & 32 deletions ...ng/Microsoft.CodeAnalysis.Analyzer.Testing/Microsoft.CodeAnalysis.Analyzer.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,40 +41,8 @@
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CodeFix.Testing" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CodeRefactoring.Testing" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.SourceGenerators.Testing" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Testing.Verifiers.MSTest" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Testing.Verifiers.NUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Testing.Verifiers.XUnit" />

<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Analyzer.Testing.UnitTests" />

<!-- Obsolete packages need access to ObsoleteMessages -->
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.NUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.NUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.NUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Testing.Verifiers.MSTest.UnitTests" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Testing.Verifiers.NUnit.UnitTests" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Testing.Verifiers.XUnit.UnitTests" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.MSTest" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.NUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.MSTest" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.NUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.MSTest" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.NUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.MSTest" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.NUnit" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit" />
</ItemGroup>

<ItemGroup>
Expand Down
20 changes: 0 additions & 20 deletions ...nalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest/AnalyzerVerifier.cs
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions ...lysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest/AnalyzerVerifier`1.cs
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ...harp.Analyzer.Testing.MSTest/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest.csproj
View file
Open in desktop

This file was deleted.

Empty file removed ...lysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest/PublicAPI.Shipped.txt
View file
Open in desktop
Empty file.
4 changes: 0 additions & 4 deletions ...sis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest/PublicAPI.Unshipped.txt
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...Analysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit/AnalyzerVerifier.cs
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions ...alysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit/AnalyzerVerifier`1.cs
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ...CSharp.Analyzer.Testing.NUnit/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit.csproj
View file
Open in desktop

This file was deleted.

Empty file removed ...alysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit/PublicAPI.Shipped.txt
View file
Open in desktop
Empty file.
4 changes: 0 additions & 4 deletions ...ysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit/PublicAPI.Unshipped.txt
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...Analysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit/AnalyzerVerifier.cs
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions ...alysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit/AnalyzerVerifier`1.cs
View file
Open in desktop

This file was deleted.

Loading