Skip to content

Commit c0bbb5a

Browse files
authored
[codex] Fix R3 bridge analyzer removal target (#2186)
Build targets: - Rename the analyzer-removal target to cover analyzers plural. - Run after ResolvePackageAssets and before CoreCompile/Csc so both ResolvedAnalyzers and Analyzer items are filtered before compilation. - Remove the ReactiveUI.Primitives.R3Bridge.Generator analyzer by filename from both item groups. Solution: - Include Directory.Build.targets in Refit.slnx so the shared target is visible from the solution.
1 parent 339cb8d commit c0bbb5a

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

src/Directory.Build.targets

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,14 @@
1111
<Error Condition="$(PackageDescription) == '' or $(PackageDescription) == $(DefaultPackageDescription)" Text="The Nuget PackageDescription property needs to be set for the project. Currently : '$(PackageDescription)'"/>
1212
</Target>
1313

14-
<Target Name="RemoveReactiveUIPrimitivesR3BridgeAnalyzer" AfterTargets="ResolveLockFileAnalyzers">
14+
<Target Name="RemoveReactiveUIPrimitivesR3BridgeAnalyzers"
15+
AfterTargets="ResolvePackageAssets"
16+
BeforeTargets="CoreCompile;Csc">
1517
<ItemGroup>
16-
<Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.NuGetPackageId)' == 'ReactiveUI.Primitives' and '%(Analyzer.Filename)%(Analyzer.Extension)' == 'ReactiveUI.Primitives.R3Bridge.Generator.dll'"/>
18+
<ResolvedAnalyzers Remove="@(ResolvedAnalyzers)"
19+
Condition="'%(ResolvedAnalyzers.Filename)' == 'ReactiveUI.Primitives.R3Bridge.Generator'" />
20+
<Analyzer Remove="@(Analyzer)"
21+
Condition="'%(Analyzer.Filename)' == 'ReactiveUI.Primitives.R3Bridge.Generator'" />
1722
</ItemGroup>
1823
</Target>
1924
</Project>

src/Refit.slnx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<File Path="../LICENSE" />
2020
<File Path="../README.md" />
2121
<File Path="Directory.Build.props" />
22+
<File Path="Directory.Build.targets" />
2223
<File Path="Directory.Packages.props" />
2324
<File Path="testconfig.json" />
2425
</Folder>

0 commit comments

Comments
 (0)