Skip to content

Commit 490b1ea

Browse files
authored
chore: upgrade to .NET 10, migrate to .slnx, bump to 0.4.0-alpha.1 (#19)
## Summary First branch of the 0.4 cycle. Bumps every TargetFramework from `net9.0` → `net10.0`, renames the demo folder `NET9/` → `NET10/`, migrates the solution to the new `.slnx` XML format, removes the `EnableStaticWebAssetsCompression=false` workaround (the .NET 10 SDK fixed the underlying bug), and bumps the centralized version to `0.4.0-alpha.1`. Single-target `net10.0` for simplicity. `net9.0` STS reaches EOL this month; `net8.0` LTS users can stay on the `0.3.x` line until they upgrade. If enterprise demand justifies it later, we can multi-target `net8.0;net10.0` in a follow-up before 1.0. C# 14 modernization (`field` keyword, partial constructors, extension members, etc.) is intentionally **not** in this branch — it'll get its own dedicated `chore/csharp14-sweep` branch later so the diff is reviewable. ## Changes ### Framework + tooling - `global.json` — SDK pin `9.0.100` → `10.0.100` - `Directory.Build.props` — `0.3.0-rc.1` → `0.4.0-alpha.1` - All 5 first-party `.csproj`s (`Core`, `Templates`, `CLI`, `Components`, `Tests`) — `<TargetFramework>net9.0</TargetFramework>` → `net10.0` - Both demo `.csproj`s (`BlazorInteractiveServer`, `ShellUI.Preview`) — same TFM bump - `Microsoft.AspNetCore.Components.Web` package ref `9.0.6` → `10.0.0` (Components) - `Microsoft.AspNetCore.Components.WebAssembly` and `.DevServer` `9.0.0` → `10.0.0` (Preview) - `IntegrationTest1.cs` — hardcoded CLI build path `bin/Release/net9.0/` → `bin/Release/net10.0/` ### Solution format migration - `ShellUI.sln` removed, `ShellUI.slnx` generated via `dotnet sln ShellUI.sln migrate`. Cleaner XML, much more diffable, no copy-paste risk: ```xml <Solution> <Configurations> <Platform Name="Any CPU" /> <Platform Name="x64" /> <Platform Name="x86" /> </Configurations> <Folder Name="/src/"> <Project Path="src/ShellUI.CLI/ShellUI.CLI.csproj" /> <Project Path="src/ShellUI.Components/ShellUI.Components.csproj" /> <Project Path="src/ShellUI.Core/ShellUI.Core.csproj" /> <Project Path="src/ShellUI.Templates/ShellUI.Templates.csproj" /> </Folder> <Project Path="ShellUI.Tests/ShellUI.Tests.csproj" /> </Solution> ``` - All CI workflow `dotnet restore|build|test|pack ShellUI.sln` invocations updated to `ShellUI.slnx` ### Demo folder rename - `NET9/` → `NET10/` (`git mv`, preserves history per the rename detector). Updated the preview-pages workflow path filters and publish step accordingly. ### .NET 10 SDK fixed our workaround - `ShellUI.Components.csproj` — `<EnableStaticWebAssetsCompression>false</EnableStaticWebAssetsCompression>` and the `<StaticWebAssetsBuildMode>` line are gone. The original comment said "(.NET 10 SDK bug workaround)" — confirmed by `dotnet pack` working clean without them. ### CI workflows - `.github/workflows/ci.yml` — `dotnet-version: 9.0.x` → `10.0.x`, `.sln` → `.slnx` - `.github/workflows/release.yml` — same - `.github/workflows/preview-pages.yml` — same + `NET9/ShellUI.Preview/**` path filter → `NET10/ShellUI.Preview/**` ### Docs - `docs/PROJECT_STATUS.md` — prerequisite `.NET 9.0 SDK` → `.NET 10.0 SDK`, demo path `NET9/BlazorInteractiveServer` → `NET10/`, "Key Decision #4" rewritten to explain why .NET 10 single-target instead of multi-target - `docs/ARCHITECTURE.md` — `NET9/` → `NET10/` - `docs/tailwind-setup.md` — `.NET 9.0 SDK` → `.NET 10.0 SDK` ## Verification - `dotnet restore ShellUI.slnx` — clean, all packages resolved on .NET 10 - `dotnet build ShellUI.slnx -c Release` — clean (0 errors, 0 warnings), packages emitted as `0.4.0-alpha.1.nupkg` - `dotnet test ShellUI.Tests` — **51/51 unit tests passing on `net10.0`** (skipping the 2 slow CLI integration tests that need scaffolded projects — those will run in the CI smoke step) - `dotnet pack src/ShellUI.Components` without the workaround — clean pack succeeds; confirms .NET 10 SDK fixed the bug ## Test plan - [ ] CI green on .NET 10 — build, all unit tests, end-to-end smoke (scaffold + `shellui init` + `shellui add chart pie-chart dashboard-02 data-table` + `dotnet build` on a real `dotnet new blazor` template) - [ ] Local: `dotnet new blazor` (which now generates a .NET 10 project) + install the prerelease CLI tool from this branch's pack + `shellui init` + `shellui add` — confirm it still works end-to-end against the new template - [ ] Local: open `ShellUI.slnx` in VS 2022 17.10+ and confirm the solution loads correctly - [ ] Verify `Blazor-ApexCharts 6.0.2` and `System.Linq.Dynamic.Core 1.7.1` work on .NET 10 (they multi-target down to `net6.0`/`netstandard2.0`, so they should be fine via roll-forward — the build success above already proves the resolver picks them up)
2 parents 3ab70d0 + 49a7f24 commit 490b1ea

250 files changed

Lines changed: 49 additions & 136 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
@@ -25,16 +25,16 @@ jobs:
2525
uses: actions/setup-dotnet@v4
2626
with:
2727
dotnet-version: |
28-
9.0.x
28+
10.0.x
2929
3030
- name: Restore dependencies
31-
run: dotnet restore ShellUI.sln
31+
run: dotnet restore ShellUI.slnx
3232

3333
- name: Build
34-
run: dotnet build ShellUI.sln --no-restore --configuration Release
34+
run: dotnet build ShellUI.slnx --no-restore --configuration Release
3535

3636
- name: Run tests
37-
run: dotnet test ShellUI.sln --no-restore --no-build --configuration Release --verbosity normal
37+
run: dotnet test ShellUI.slnx --no-restore --no-build --configuration Release --verbosity normal
3838

3939
# End-to-end build of a scaffolded project — catches anything the in-process
4040
# TemplateCompileTests miss (missing usings, dependency resolution).

.github/workflows/preview-pages.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches: [ main ]
77
paths:
8-
- 'NET9/ShellUI.Preview/**'
8+
- 'NET10/ShellUI.Preview/**'
99
- 'src/ShellUI.Components/**'
1010
- '.github/workflows/preview-pages.yml'
1111
workflow_dispatch:
@@ -28,11 +28,11 @@ jobs:
2828
- name: Setup .NET
2929
uses: actions/setup-dotnet@v4
3030
with:
31-
dotnet-version: '9.0.x'
31+
dotnet-version: '10.0.x'
3232

3333
- name: Publish Preview (Blazor WASM)
3434
run: |
35-
dotnet publish NET9/ShellUI.Preview/ShellUI.Preview.csproj \
35+
dotnet publish NET10/ShellUI.Preview/ShellUI.Preview.csproj \
3636
-c Release \
3737
-o ./preview-publish
3838
env:

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup .NET
2424
uses: actions/setup-dotnet@v4
2525
with:
26-
dotnet-version: '9.0.x'
26+
dotnet-version: '10.0.x'
2727

2828
- name: Cache NuGet packages
2929
uses: actions/cache@v4
@@ -34,16 +34,16 @@ jobs:
3434
${{ runner.os }}-nuget-
3535
3636
- name: Restore dependencies
37-
run: dotnet restore ShellUI.sln
37+
run: dotnet restore ShellUI.slnx
3838

3939
- name: Build
40-
run: dotnet build ShellUI.sln --no-restore --configuration Release
40+
run: dotnet build ShellUI.slnx --no-restore --configuration Release
4141

4242
- name: Run tests
43-
run: dotnet test ShellUI.sln --no-restore --no-build --configuration Release --verbosity normal
43+
run: dotnet test ShellUI.slnx --no-restore --no-build --configuration Release --verbosity normal
4444

4545
- name: Pack NuGet packages
46-
run: dotnet pack ShellUI.sln --no-build --configuration Release -p:ContinuousIntegrationBuild=true
46+
run: dotnet pack ShellUI.slnx --no-build --configuration Release -p:ContinuousIntegrationBuild=true
4747

4848
# ShellUI.Core and ShellUI.Templates are internal-only — they have no public API
4949
# surface that consumers reference. Only the CLI tool and the Components runtime

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*.user
1010
*.userosscache
1111
*.sln.docstates
12-
12+
*.sln
1313
# User-specific files (MonoDevelop/Xamarin Studio)
1414
*.userprefs
1515

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<Project>
33
<!-- Centralized ShellUI Version - Update this single file to version all components -->
44
<PropertyGroup>
5-
<ShellUIVersion>0.3.0</ShellUIVersion>
6-
<ShellUIVersionSuffix>rc.1</ShellUIVersionSuffix>
5+
<ShellUIVersion>0.4.0</ShellUIVersion>
6+
<ShellUIVersionSuffix>alpha.1</ShellUIVersionSuffix>
77
</PropertyGroup>
88

99
<!-- Common properties for all ShellUI projects -->

NET9/BlazorInteractiveServer/BlazorInteractiveServer.csproj renamed to NET10/BlazorInteractiveServer/BlazorInteractiveServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
File renamed without changes.
File renamed without changes.

NET9/BlazorInteractiveServer/Components/Demo/AdvancedFormDemo.razor renamed to NET10/BlazorInteractiveServer/Components/Demo/AdvancedFormDemo.razor

File renamed without changes.

NET9/BlazorInteractiveServer/Components/Demo/BadgesDialogDemo.razor renamed to NET10/BlazorInteractiveServer/Components/Demo/BadgesDialogDemo.razor

File renamed without changes.

0 commit comments

Comments
 (0)