Skip to content

Fix NRE on XUnitMigrationAnalyzer and Simplify Analyzer project files #2493

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

Merged
merged 1 commit into from
Jun 1, 2025
Merged

Fix NRE on XUnitMigrationAnalyzer and Simplify Analyzer project files #2493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions Analyzer.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project>

<Import Project="$(MSBuildThisFileDirectory)Roslyn.props" />

<ItemGroup>
<Compile Include="..\TUnit.Analyzers\**\*.cs" Exclude="..\TUnit.Analyzers\obj\**\*.cs" />
<EmbeddedResource Include="..\TUnit.Analyzers\**\*.resx" />
</ItemGroup>

</Project>
12 changes: 12 additions & 0 deletions Roslyn.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Common" VersionOverride="$(RoslynVersion).*"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="$(RoslynVersion).*"/>
<PackageReference Include="Polyfill">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
9 changes: 9 additions & 0 deletions SourceGenerator.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>

<Import Project="$(MSBuildThisFileDirectory)Roslyn.props" />

<ItemGroup>
<Compile Include="..\TUnit.Core.SourceGenerator\**\*.cs" Exclude="..\TUnit.Core.SourceGenerator\obj\**\*.cs" />
</ItemGroup>

</Project>
9 changes: 9 additions & 0 deletions TUnit.Analyzers.Roslyn414/TUnit.Analyzers.Roslyn414.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<RoslynVersion>4.14</RoslynVersion>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)..\Analyzer.props" />

</Project>
16 changes: 2 additions & 14 deletions TUnit.Analyzers.Roslyn44/TUnit.Analyzers.Roslyn44.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,6 @@
<RoslynVersion>4.4</RoslynVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Common" VersionOverride="$(RoslynVersion).*"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="$(RoslynVersion).*"/>
<PackageReference Include="Polyfill">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)..\Analyzer.props" />

<ItemGroup>
<Compile Include="..\TUnit.Analyzers\**\*.cs" Exclude="..\TUnit.Analyzers\obj\**\*.cs" />
<EmbeddedResource Include="..\TUnit.Analyzers\**\*.resx" />
</ItemGroup>

</Project>
</Project>
22 changes: 2 additions & 20 deletions TUnit.Analyzers.Roslyn47/TUnit.Analyzers.Roslyn47.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,6 @@
<RoslynVersion>4.7</RoslynVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Common" VersionOverride="$(RoslynVersion).*"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="$(RoslynVersion).*"/>
<PackageReference Include="Polyfill">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)..\Analyzer.props" />

<ItemGroup>
<Compile Include="..\TUnit.Analyzers\**\*.cs" Exclude="..\TUnit.Analyzers\obj\**\*.cs" />
<EmbeddedResource Include="..\TUnit.Analyzers\**\*.resx" />
</ItemGroup>

<ItemGroup>
<Folder Include="..\TUnit.Analyzers\EqualityComparers\">
<Link>EqualityComparers</Link>
</Folder>
</ItemGroup>

</Project>
</Project>
8 changes: 4 additions & 4 deletions TUnit.Analyzers/Migrators/XUnitMigrationAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private void AnalyzeSyntax(SyntaxNodeAnalysisContext context)
return;
}

if (symbol.AllInterfaces.Any(i => i.ContainingNamespace.Name.StartsWith("Xunit")))
if (symbol.AllInterfaces.Any(i => i.ContainingNamespace?.Name.StartsWith("Xunit") is true))
{
Flag(context);
return;
Expand Down Expand Up @@ -82,9 +82,9 @@ private void AnalyzeSyntax(SyntaxNodeAnalysisContext context)

ITypeSymbol[] types =
[
..members.OfType<IPropertySymbol>().Where(x => x.Type.ContainingNamespace.Name.StartsWith("Xunit")).Select(x => x.Type),
..members.OfType<IMethodSymbol>().Where(x => x.ReturnType.ContainingNamespace.Name.StartsWith("Xunit")).Select(x => x.ReturnType),
..members.OfType<IFieldSymbol>().Where(x => x.Type.ContainingNamespace.Name.StartsWith("Xunit")).Select(x => x.Type),
..members.OfType<IPropertySymbol>().Where(x => x.Type.ContainingNamespace?.Name.StartsWith("Xunit") is true).Select(x => x.Type),
..members.OfType<IMethodSymbol>().Where(x => x.ReturnType.ContainingNamespace?.Name.StartsWith("Xunit") is true).Select(x => x.ReturnType),
..members.OfType<IFieldSymbol>().Where(x => x.Type.ContainingNamespace?.Name.StartsWith("Xunit") is true).Select(x => x.Type),
];

if (types.Any())
Expand Down
9 changes: 9 additions & 0 deletions TUnit.Core.SourceGenerator.Roslyn414/TUnit.Core.SourceGenerator.Roslyn414.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<RoslynVersion>4.14</RoslynVersion>
</PropertyGroup>

<Import Project="..\SourceGenerator.props" />

</Project>
13 changes: 1 addition & 12 deletions TUnit.Core.SourceGenerator.Roslyn44/TUnit.Core.SourceGenerator.Roslyn44.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,6 @@
<RoslynVersion>4.4</RoslynVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Common" VersionOverride="$(RoslynVersion).*"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="$(RoslynVersion).*"/>
<PackageReference Include="Polyfill">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Compile Include="..\TUnit.Core.SourceGenerator\**\*.cs" Exclude="..\TUnit.Core.SourceGenerator\obj\**\*.cs" />
</ItemGroup>
<Import Project="..\SourceGenerator.props" />

</Project>
21 changes: 2 additions & 19 deletions TUnit.Core.SourceGenerator.Roslyn47/TUnit.Core.SourceGenerator.Roslyn47.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,7 @@
<PropertyGroup>
<RoslynVersion>4.7</RoslynVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Common" VersionOverride="$(RoslynVersion).*"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="$(RoslynVersion).*"/>
<PackageReference Include="Polyfill">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Compile Include="..\TUnit.Core.SourceGenerator\**\*.cs" Exclude="..\TUnit.Core.SourceGenerator\obj\**\*.cs" />
<Compile Update="..\TUnit.Core.SourceGenerator\CodeGenerators\Helpers\DynamicTestSourceDataModelRetriever.cs">
<Link>CodeGenerators\Helpers\DynamicTestSourceDataModelRetriever.cs</Link>
</Compile>
<Compile Update="..\TUnit.Core.SourceGenerator\Models\DynamicTestSourceDataModel.cs">
<Link>Models\DynamicTestSourceDataModel.cs</Link>
</Compile>
</ItemGroup>
<Import Project="..\SourceGenerator.props" />

</Project>
</Project>
15 changes: 13 additions & 2 deletions TUnit.Core/TUnit.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,30 @@
<None
Include="$(MSBuildProjectDirectory)\..\TUnit.Analyzers.Roslyn44\bin\$(Configuration)\netstandard2.0\TUnit.Analyzers.dll"
Pack="true" PackagePath="analyzers/dotnet/roslyn4.4/cs" Visible="false" />

<None
Include="$(MSBuildProjectDirectory)\..\TUnit.Analyzers.Roslyn47\bin\$(Configuration)\netstandard2.0\TUnit.Analyzers.dll"
Pack="true" PackagePath="analyzers/dotnet/roslyn4.7/cs" Visible="false" />

<None Include="$(MSBuildProjectDirectory)\..\TUnit.Analyzers.CodeFixers\bin\$(Configuration)\netstandard2.0\TUnit.Analyzers.CodeFixers.dll"
Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None
Include="$(MSBuildProjectDirectory)\..\TUnit.Analyzers.Roslyn414\bin\$(Configuration)\netstandard2.0\TUnit.Analyzers.dll"
Pack="true" PackagePath="analyzers/dotnet/roslyn4.14/cs" Visible="false" />

<None
Include="$(MSBuildProjectDirectory)\..\TUnit.Analyzers.CodeFixers\bin\$(Configuration)\netstandard2.0\TUnit.Analyzers.CodeFixers.dll"
Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />

<None
Include="$(MSBuildProjectDirectory)\..\TUnit.Core.SourceGenerator.Roslyn44\bin\$(Configuration)\netstandard2.0\TUnit.Core.SourceGenerator.dll"
Pack="true" PackagePath="analyzers/dotnet/roslyn4.4/cs" Visible="false" />

<None
Include="$(MSBuildProjectDirectory)\..\TUnit.Core.SourceGenerator.Roslyn47\bin\$(Configuration)\netstandard2.0\TUnit.Core.SourceGenerator.dll"
Pack="true" PackagePath="analyzers/dotnet/roslyn4.7/cs" Visible="false" />

<None
Include="$(MSBuildProjectDirectory)\..\TUnit.Core.SourceGenerator.Roslyn414\bin\$(Configuration)\netstandard2.0\TUnit.Core.SourceGenerator.dll"
Pack="true" PackagePath="analyzers/dotnet/roslyn4.14/cs" Visible="false" />
</ItemGroup>
<ItemGroup>
<PackageReference Remove="Backport.System.Threading.Lock" />
Expand Down
14 changes: 14 additions & 0 deletions TUnit.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TestProject", "TUnit.Templa
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WebApp", "TUnit.Templates\content\TUnit.AspNet.FSharp\WebApp\WebApp.fsproj", "{2B950D9B-C0FB-20E2-05FF-C70F639E9E28}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TUnit.Analyzers.Roslyn414", "TUnit.Analyzers.Roslyn414\TUnit.Analyzers.Roslyn414.csproj", "{C6EEC750-06EE-46E2-9468-0CBD202D1BE9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TUnit.Core.SourceGenerator.Roslyn414", "TUnit.Core.SourceGenerator.Roslyn414\TUnit.Core.SourceGenerator.Roslyn414.csproj", "{9E5E9515-109F-4E01-A307-F3B28CE5F3CB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -327,6 +331,14 @@ Global
{2B950D9B-C0FB-20E2-05FF-C70F639E9E28}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2B950D9B-C0FB-20E2-05FF-C70F639E9E28}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2B950D9B-C0FB-20E2-05FF-C70F639E9E28}.Release|Any CPU.Build.0 = Release|Any CPU
{C6EEC750-06EE-46E2-9468-0CBD202D1BE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C6EEC750-06EE-46E2-9468-0CBD202D1BE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C6EEC750-06EE-46E2-9468-0CBD202D1BE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C6EEC750-06EE-46E2-9468-0CBD202D1BE9}.Release|Any CPU.Build.0 = Release|Any CPU
{9E5E9515-109F-4E01-A307-F3B28CE5F3CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9E5E9515-109F-4E01-A307-F3B28CE5F3CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E5E9515-109F-4E01-A307-F3B28CE5F3CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9E5E9515-109F-4E01-A307-F3B28CE5F3CB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -383,6 +395,8 @@ Global
{98CF3A63-B408-4711-974F-FD894FB905F6} = {23F41068-7C7E-435C-B6AB-4258B6380DC2}
{BCB6A765-B792-6EEB-5E21-8A32872B0DB9} = {98CF3A63-B408-4711-974F-FD894FB905F6}
{2B950D9B-C0FB-20E2-05FF-C70F639E9E28} = {98CF3A63-B408-4711-974F-FD894FB905F6}
{C6EEC750-06EE-46E2-9468-0CBD202D1BE9} = {503DA9FA-045D-4910-8AF6-905E6048B1F1}
{9E5E9515-109F-4E01-A307-F3B28CE5F3CB} = {6F7B9D8E-4539-42BC-BE0B-E5BE70ED9473}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {109D285A-36B3-4503-BCDF-8E26FB0E2C5B}
Expand Down
Loading