Skip to content

Commit 30263f4

Browse files
Copilotglennawatson
andcommitted
refactor: migrate away from .shproj to SDK-style linked files
- Replace .shproj/.projitems Import with direct Compile Include pattern - Update Roslyn4120 and Roslyn480 projects to link files using wildcard pattern - Remove shared project references from solution file - Fix using directives ordering in TestHelper.cs (StyleCop compliance) This makes the build dotnet CLI-friendly and works on all CI agents without requiring Visual Studio-specific MSBuild extensions. All 33 tests pass. Co-authored-by: glennawatson <[email protected]>
1 parent 8cd267f commit 30263f4

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

src/ReactiveUI.SourceGenerator.Tests/TestHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
using NuGet.LibraryModel;
1111
using NuGet.Versioning;
1212

13+
using NUnit.Framework;
14+
1315
using ReactiveMarbles.NuGet.Helpers;
1416

1517
using ReactiveMarbles.SourceGenerator.TestNuGetHelper.Compilation;
1618

1719
using ReactiveUI.SourceGenerators;
1820
using ReactiveUI.SourceGenerators.WinForms;
1921

20-
using NUnit.Framework;
21-
2222
namespace ReactiveUI.SourceGenerator.Tests;
2323

2424
/// <summary>

src/ReactiveUI.SourceGenerators.Roslyn4120/ReactiveUI.SourceGenerators.Roslyn4120.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<InternalsVisibleTo Include="ReactiveUI.CodeFixes" />
3030
</ItemGroup>
3131

32-
<Import Project="..\ReactiveUI.SourceGenerators.Roslyn\ReactiveUI.SourceGenerators.Roslyn.projitems" Label="Shared" />
32+
<ItemGroup>
33+
<Compile Include="..\ReactiveUI.SourceGenerators.Roslyn\**\*.cs" LinkBase="Shared" />
34+
</ItemGroup>
3335

3436
</Project>

src/ReactiveUI.SourceGenerators.Roslyn480/ReactiveUI.SourceGenerators.Roslyn480.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
<InternalsVisibleTo Include="ReactiveUI.CodeFixes" />
2525
</ItemGroup>
2626

27-
<Import Project="..\ReactiveUI.SourceGenerators.Roslyn\ReactiveUI.SourceGenerators.Roslyn.projitems" Label="Shared" />
27+
<ItemGroup>
28+
<Compile Include="..\ReactiveUI.SourceGenerators.Roslyn\**\*.cs" LinkBase="Shared" />
29+
</ItemGroup>
2830

2931
</Project>

src/ReactiveUI.SourceGenerators.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.SourceGenerators
3434
EndProject
3535
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NestedTest", "NestedTest", "{CAFBD27B-5078-4A0C-A4E9-19DCF2A7DF16}"
3636
EndProject
37-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ReactiveUI.SourceGenerators.Roslyn", "ReactiveUI.SourceGenerators.Roslyn\ReactiveUI.SourceGenerators.Roslyn.shproj", "{BC460DAF-92ED-41D9-9EB4-2C92121D62A8}"
38-
EndProject
3937
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.SourceGenerators.Roslyn480", "ReactiveUI.SourceGenerators.Roslyn480\ReactiveUI.SourceGenerators.Roslyn480.csproj", "{7C308972-5697-464F-BEAE-02FE9E03BECE}"
4038
EndProject
4139
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.SourceGenerators.Roslyn4120", "ReactiveUI.SourceGenerators.Roslyn4120\ReactiveUI.SourceGenerators.Roslyn4120.csproj", "{BF121262-7F30-4EC0-9F03-324AC3B834B8}"
@@ -101,9 +99,4 @@ Global
10199
GlobalSection(ExtensibilityGlobals) = postSolution
102100
SolutionGuid = {173F891B-86A2-4226-B563-A7318CE0E2EC}
103101
EndGlobalSection
104-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
105-
ReactiveUI.SourceGenerators.Roslyn\ReactiveUI.SourceGenerators.Roslyn.projitems*{7c308972-5697-464f-beae-02fe9e03bece}*SharedItemsImports = 5
106-
ReactiveUI.SourceGenerators.Roslyn\ReactiveUI.SourceGenerators.Roslyn.projitems*{bc460daf-92ed-41d9-9eb4-2c92121d62a8}*SharedItemsImports = 13
107-
ReactiveUI.SourceGenerators.Roslyn\ReactiveUI.SourceGenerators.Roslyn.projitems*{bf121262-7f30-4ec0-9f03-324ac3b834b8}*SharedItemsImports = 5
108-
EndGlobalSection
109102
EndGlobal

0 commit comments

Comments
 (0)