Skip to content

Commit 1000fde

Browse files
mishael-oCopilot
mishael-o
and
Copilot
committed
refactor: reorganize libraries, tests, and sample projects
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 72cae9f commit 1000fde

220 files changed

Lines changed: 1463 additions & 159 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,22 @@ jobs:
5151
10.0.x
5252
5353
- name: Restore
54-
run: dotnet restore src/Blazing.Mvvm.CI.slnf
54+
run: dotnet restore src/Blazing.Mvvm.slnx
5555

5656
- name: Build
57-
run: dotnet build src/Blazing.Mvvm.CI.slnf --no-restore --configuration Release -p:GeneratePackageOnBuild=false
57+
run: dotnet build src/Blazing.Mvvm.slnx --no-restore --configuration Release -p:GeneratePackageOnBuild=false
5858

5959
- name: Test (${{ matrix.framework }})
6060
run: |
61-
dotnet test src/Blazing.Mvvm.Tests/Blazing.Mvvm.Tests.csproj \
61+
dotnet test src/Tests/Blazing.Mvvm.Tests/Blazing.Mvvm.Tests.csproj \
6262
--no-build \
6363
--configuration Release \
6464
--framework ${{ matrix.framework }} \
6565
--logger "trx;LogFileName=test-results-${{ matrix.framework }}.trx"
6666
6767
- name: Test Analyzers (${{ matrix.framework }})
6868
run: |
69-
dotnet test src/Blazing.Mvvm.Analyzers.Tests/Blazing.Mvvm.Analyzers.Tests.csproj \
69+
dotnet test src/Tests/Blazing.Mvvm.Analyzers.Tests/Blazing.Mvvm.Analyzers.Tests.csproj \
7070
--no-build \
7171
--configuration Release \
7272
--framework ${{ matrix.framework }} \

‎.github/workflows/release.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,25 @@ jobs:
2424
10.0.x
2525
2626
- name: Restore
27-
run: dotnet restore src/Blazing.Mvvm.CI.slnf
27+
run: dotnet restore src/Blazing.Mvvm.slnx
2828

2929
- name: Build
30-
run: dotnet build src/Blazing.Mvvm.CI.slnf --no-restore --configuration Release -p:GeneratePackageOnBuild=false
30+
run: dotnet build src/Blazing.Mvvm.slnx --no-restore --configuration Release -p:GeneratePackageOnBuild=false
3131

3232
- name: Test (net8.0)
3333
run: |
34-
dotnet test src/Blazing.Mvvm.Tests/Blazing.Mvvm.Tests.csproj --no-build --configuration Release --framework net8.0
35-
dotnet test src/Blazing.Mvvm.Analyzers.Tests/Blazing.Mvvm.Analyzers.Tests.csproj --no-build --configuration Release --framework net8.0
34+
dotnet test src/Tests/Blazing.Mvvm.Tests/Blazing.Mvvm.Tests.csproj --no-build --configuration Release --framework net8.0
35+
dotnet test src/Tests/Blazing.Mvvm.Analyzers.Tests/Blazing.Mvvm.Analyzers.Tests.csproj --no-build --configuration Release --framework net8.0
3636
3737
- name: Test (net9.0)
3838
run: |
39-
dotnet test src/Blazing.Mvvm.Tests/Blazing.Mvvm.Tests.csproj --no-build --configuration Release --framework net9.0
40-
dotnet test src/Blazing.Mvvm.Analyzers.Tests/Blazing.Mvvm.Analyzers.Tests.csproj --no-build --configuration Release --framework net9.0
39+
dotnet test src/Tests/Blazing.Mvvm.Tests/Blazing.Mvvm.Tests.csproj --no-build --configuration Release --framework net9.0
40+
dotnet test src/Tests/Blazing.Mvvm.Analyzers.Tests/Blazing.Mvvm.Analyzers.Tests.csproj --no-build --configuration Release --framework net9.0
4141
4242
- name: Test (net10.0)
4343
run: |
44-
dotnet test src/Blazing.Mvvm.Tests/Blazing.Mvvm.Tests.csproj --no-build --configuration Release --framework net10.0
45-
dotnet test src/Blazing.Mvvm.Analyzers.Tests/Blazing.Mvvm.Analyzers.Tests.csproj --no-build --configuration Release --framework net10.0
44+
dotnet test src/Tests/Blazing.Mvvm.Tests/Blazing.Mvvm.Tests.csproj --no-build --configuration Release --framework net10.0
45+
dotnet test src/Tests/Blazing.Mvvm.Analyzers.Tests/Blazing.Mvvm.Analyzers.Tests.csproj --no-build --configuration Release --framework net10.0
4646
4747
- name: Extract version from Directory.Build.props
4848
id: version
@@ -67,9 +67,9 @@ jobs:
6767
- name: Pack NuGet packages
6868
if: steps.tag_check.outputs.exists == 'false'
6969
run: |
70-
dotnet pack src/Blazing.Mvvm.Base/Blazing.Mvvm.Base.csproj \
70+
dotnet pack src/Libraries/Blazing.Mvvm.Base/Blazing.Mvvm.Base.csproj \
7171
--no-build --configuration Release --output ./artifacts
72-
dotnet pack src/Blazing.Mvvm/Blazing.Mvvm.csproj \
72+
dotnet pack src/Libraries/Blazing.Mvvm/Blazing.Mvvm.csproj \
7373
--no-build --configuration Release --output ./artifacts
7474
7575
- name: Create GitHub Release

‎ci-cd-test-run.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ $SrcRoot = Join-Path $RepoRoot 'src'
6464
$WorkflowDir = Join-Path $RepoRoot '.github' 'workflows'
6565
$CiYaml = Join-Path $WorkflowDir 'ci.yml'
6666
$ReleaseYaml = Join-Path $WorkflowDir 'release.yml'
67-
$SlnFilter = Join-Path $SrcRoot 'Blazing.Mvvm.CI.slnf'
67+
$SolutionPath = Join-Path $SrcRoot 'Blazing.Mvvm.slnx'
6868
$DbProps = Join-Path $SrcRoot 'Directory.Build.props'
69-
$MvvmTests = Join-Path $SrcRoot 'Blazing.Mvvm.Tests' 'Blazing.Mvvm.Tests.csproj'
70-
$AnalyzerTests = Join-Path $SrcRoot 'Blazing.Mvvm.Analyzers.Tests' 'Blazing.Mvvm.Analyzers.Tests.csproj'
69+
$MvvmTests = Join-Path $SrcRoot 'Tests' 'Blazing.Mvvm.Tests' 'Blazing.Mvvm.Tests.csproj'
70+
$AnalyzerTests = Join-Path $SrcRoot 'Tests' 'Blazing.Mvvm.Analyzers.Tests' 'Blazing.Mvvm.Analyzers.Tests.csproj'
7171
$Frameworks = @('net8.0', 'net9.0', 'net10.0')
7272

7373
# ── Tool check ─────────────────────────────────────────────────────────────────

‎samples/Blazing.Mvvm.AnalyzerTest/Blazing.Mvvm.AnalyzerTest.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<ProjectReference Include="..\..\src\Blazing.Mvvm\Blazing.Mvvm.csproj" />
14-
<ProjectReference Include="..\..\src\Blazing.Mvvm.Base\Blazing.Mvvm.Base.csproj" />
15-
<ProjectReference Include="..\..\src\Blazing.Mvvm.Analyzers\Blazing.Mvvm.Analyzers.csproj"
13+
<ProjectReference Include="..\..\src\Libraries\Blazing.Mvvm\Blazing.Mvvm.csproj" />
14+
<ProjectReference Include="..\..\src\Libraries\Blazing.Mvvm.Base\Blazing.Mvvm.Base.csproj" />
15+
<ProjectReference Include="..\..\src\Libraries\Blazing.Mvvm.Analyzers\Blazing.Mvvm.Analyzers.csproj"
1616
OutputItemType="Analyzer"
1717
ReferenceOutputAssembly="false" />
1818
</ItemGroup>

‎samples/Blazing.Mvvm.Sample.HybridMaui/Blazing.Mvvm.Sample.HybridMaui.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
</ItemGroup>
8181

8282
<ItemGroup>
83-
<ProjectReference Include="..\..\src\Blazing.Mvvm.Base\Blazing.Mvvm.Base.csproj" />
84-
<ProjectReference Include="..\..\src\Blazing.Mvvm\Blazing.Mvvm.csproj" />
83+
<ProjectReference Include="..\..\src\Libraries\Blazing.Mvvm.Base\Blazing.Mvvm.Base.csproj" />
84+
<ProjectReference Include="..\..\src\Libraries\Blazing.Mvvm\Blazing.Mvvm.csproj" />
8585
<ProjectReference Include="..\libs\Blazing.Mvvm.Sample.Shared\Blazing.Mvvm.Sample.Shared.csproj" />
8686
</ItemGroup>
8787

‎samples/Blazing.Mvvm.Sample.Server/Blazing.Mvvm.Sample.Server.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<ProjectReference Include="..\..\src\Blazing.Mvvm\Blazing.Mvvm.csproj" />
12+
<ProjectReference Include="..\..\src\Libraries\Blazing.Mvvm\Blazing.Mvvm.csproj" />
1313
<ProjectReference Include="..\libs\Blazing.Buttons\Blazing.Buttons.csproj" />
1414
<ProjectReference Include="..\libs\Blazing.Mvvm.Sample.Shared\Blazing.Mvvm.Sample.Shared.csproj" />
1515
</ItemGroup>

‎samples/Blazing.Mvvm.Sample.Wasm/Blazing.Mvvm.Sample.Wasm.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<ProjectReference Include="..\..\src\Blazing.Mvvm\Blazing.Mvvm.csproj" />
14+
<ProjectReference Include="..\..\src\Libraries\Blazing.Mvvm\Blazing.Mvvm.csproj" />
1515
<ProjectReference Include="..\libs\Blazing.Mvvm.Sample.Shared\Blazing.Mvvm.Sample.Shared.csproj" />
1616
</ItemGroup>
1717

‎samples/Blazing.Mvvm.Sample.WebApp/Blazing.Mvvm.Sample.WebApp.Client/Blazing.Mvvm.Sample.WebApp.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="..\..\..\src\Blazing.Mvvm\Blazing.Mvvm.csproj" />
15+
<ProjectReference Include="..\..\..\src\Libraries\Blazing.Mvvm\Blazing.Mvvm.csproj" />
1616
<ProjectReference Include="..\..\libs\Blazing.Mvvm.Sample.Shared\Blazing.Mvvm.Sample.Shared.csproj" />
1717
</ItemGroup>
1818

‎samples/Blazing.Mvvm.Sample.WebApp/Blazing.Mvvm.Sample.WebApp/Blazing.Mvvm.Sample.WebApp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<ProjectReference Include="..\..\..\src\Blazing.Mvvm\Blazing.Mvvm.csproj" />
16+
<ProjectReference Include="..\..\..\src\Libraries\Blazing.Mvvm\Blazing.Mvvm.csproj" />
1717
<ProjectReference Include="..\..\libs\Blazing.Mvvm.Sample.Shared\Blazing.Mvvm.Sample.Shared.csproj" />
1818
<ProjectReference Include="..\Blazing.Mvvm.Sample.WebApp.Client\Blazing.Mvvm.Sample.WebApp.Client.csproj" />
1919
</ItemGroup>

‎samples/Blazing.Mvvm.Security.Wasm/Blazing.Mvvm.Security.Wasm.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<ProjectReference Include="..\..\src\Blazing.Mvvm\Blazing.Mvvm.csproj" />
16+
<ProjectReference Include="..\..\src\Libraries\Blazing.Mvvm\Blazing.Mvvm.csproj" />
1717
<ProjectReference Include="..\libs\Blazing.Mvvm.Sample.Shared\Blazing.Mvvm.Sample.Shared.csproj" />
1818
</ItemGroup>
1919

0 commit comments

Comments
 (0)