Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ jobs:
- uses: actions/setup-dotnet@v5
with:
global-json-file: packages/blazor-workspace/global.json
# Install dotnet 8 sdk for asp.net assemblies
- uses: actions/setup-dotnet@v5
Comment thread
rajsite marked this conversation as resolved.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I skimmed a few Skyline .NET 10 upgrade PRs to see if there were any other common tasks we've done. (You can find these by looking through the history of global.json in some microservices).

One suggestion I found is to adopt the cleaner .slnx file format for the BlazorWorkspace.sln. But you can consider that optional / follow up if you want, not all services did it.

You might also ask some of the devs who did these upgrades (Paul, Darren, Aaron, etc) if there's anything else we should be thinking about.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added slnx, and will ping previous .NET updaters

with:
dotnet-version: '8.0.422'
Comment thread
rajsite marked this conversation as resolved.
- run: dotnet restore --locked-mode
working-directory: packages/blazor-workspace/
- uses: actions/setup-node@v6
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ To submit changes to Nimble, the first step is to build the monorepo which requi
- Sync down a copy of the nimble repository
- Note: For one-off small contributions you can consider using a fork-pull workflow. However [fork-pull workflows are not yet supported](https://github.com/ni/nimble/issues/634) for substantial development. For substantial development you should be added as a Contributor to the repository. See the [`README.md` Community section](/README.md#community) to get in touch if you need Contributor permissions.
- Install Node.js version 24+ (run `node --version`) which can be downloaded from <https://nodejs.org/en/download/>
- Install .NET 8 SDK (see required version in [`globals.json`](/packages/blazor-workspace/global.json)) which can be downloaded from <https://dotnet.microsoft.com/en-us/download>
- Run `dotnet --info` to verify the required version of the SDK is installed. A `v8` install is required, but it's fine if later versions are installed too.
- Install .NET SDK (see required version in [`globals.json`](/packages/blazor-workspace/global.json)) which can be downloaded from <https://dotnet.microsoft.com/en-us/download>
- Run `dotnet --info` to verify the required version of the SDK is installed. An sdk that matches the major version is required, but can have a greater minor / patch version.
- If running on an IT-managed system, set env var `NODE_USE_SYSTEM_CA=1`
- This avoids errors during `npm install` like `playwright Error: unable to get local issuer certificate`. See Node docs: [Adding CA Certificates from the System Store](https://nodejs.org/en/learn/http/enterprise-network-configuration#adding-ca-certificates-from-the-system-store).

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "Add .NET 10 support while retaining .NET 8. Note: Standalone Blazor apps may need to enable static asset fingerprinting. See PR for details: https://github.com/ni/nimble/pull/2976",
"packageName": "@ni/nimble-blazor",
"email": "1588923+rajsite@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "Add .NET 10 support while retaining .NET 8. Note: Standalone Blazor apps may need to enable static asset fingerprinting. See PR for details: https://github.com/ni/nimble/pull/2976",
"packageName": "@ni/ok-blazor",
"email": "1588923+rajsite@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "Add .NET 10 support while retaining .NET 8. Note: Standalone Blazor apps may need to enable static asset fingerprinting. See PR for details: https://github.com/ni/nimble/pull/2976",
"packageName": "@ni/spright-blazor",
"email": "1588923+rajsite@users.noreply.github.com",
"dependentChangeType": "patch"
}
127 changes: 0 additions & 127 deletions packages/blazor-workspace/BlazorWorkspace.sln

This file was deleted.

21 changes: 21 additions & 0 deletions packages/blazor-workspace/BlazorWorkspace.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<Solution>
<Folder Name="/Examples/">
<Project Path="Examples/Demo.Client/Demo.Client.csproj" />
<Project Path="Examples/Demo.Hybrid/Demo.Hybrid.csproj" />
<Project Path="Examples/Demo.Server/Demo.Server.csproj" />
<Project Path="Examples/Demo.Shared/Demo.Shared.csproj" />
</Folder>
<Folder Name="/Tests/">
<Project Path="Tests/BlazorWorkspace.Testing.Acceptance/BlazorWorkspace.Testing.Acceptance.csproj" />
<Project Path="Tests/NimbleBlazor.Tests.Acceptance.Client/NimbleBlazor.Tests.Acceptance.Client.csproj" />
<Project Path="Tests/NimbleBlazor.Tests.Acceptance/NimbleBlazor.Tests.Acceptance.csproj" />
<Project Path="Tests/NimbleBlazor.Tests/NimbleBlazor.Tests.csproj" />
<Project Path="Tests/OkBlazor.Tests.Acceptance/OkBlazor.Tests.Acceptance.csproj" />
<Project Path="Tests/OkBlazor.Tests/OkBlazor.Tests.csproj" />
<Project Path="Tests/SprightBlazor.Tests.Acceptance/SprightBlazor.Tests.Acceptance.csproj" />
<Project Path="Tests/SprightBlazor.Tests/SprightBlazor.Tests.csproj" />
</Folder>
<Project Path="NimbleBlazor/NimbleBlazor.csproj" />
<Project Path="OkBlazor/OkBlazor.csproj" />
<Project Path="SprightBlazor/SprightBlazor.csproj" />
</Solution>
2 changes: 2 additions & 0 deletions packages/blazor-workspace/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<Project>
<PropertyGroup>
<!-- The codebase uses C# 14 language features, pin for consistency across framework versions. -->
<LangVersion>14.0</LangVersion>
<WarningsNotAsErrors>;NU1900;CS0122</WarningsNotAsErrors>
<NoWarn>;NU1701;CA1515;CA1716;CA1707;NU1900;CS0122;CS1573;CS1591,@(RoslynTransition_DisabledRule)</NoWarn>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<OverrideHtmlAssetPlaceholders>true</OverrideHtmlAssetPlaceholders>
</PropertyGroup>

<ItemGroup>
<Content Remove="packages.lock.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.27" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.27" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.8" PrivateAssets="all" />
<PackageReference Include="AspNetCore.SassCompiler" Version="1.100.0" />
</ItemGroup>

Expand Down
Loading