Skip to content

Upgrade to .NET 10.0; set version to 10.x #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jburnett wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade to .NET 10.0; set version to 10.x #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b7db6a
Upgrade to .NET 10.0; set version to 10.x
jburnett Jan 6, 2026
b4e44ed
Upgrade CICD WF to use .NET 10
jburnett Jan 6, 2026
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: 2 additions & 2 deletions .github/workflows/dotnet-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Setup .NET 9.0
- name: Setup .NET 10.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 9.0.*
dotnet-version: 10.0.*

- name: Install dependencies
run: dotnet restore
Expand Down
24 changes: 12 additions & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,37 @@ test: build
## MergeWith only works with json (coverlet's native format). On the last test, output cobertura fmt
## Tests need to be run separately rather than via sln file
cover: build
dotnet test --no-build Test.J3DI.Domain/Test.J3DI.Domain.csproj --framework net9.0 --logger:trx --results-directory ../TestResults \
dotnet test --no-build Test.J3DI.Domain/Test.J3DI.Domain.csproj --framework net10.0 --logger:trx --results-directory ../TestResults \
"/p:Exclude=\"[Test.J3DI.*]*\"" \
"/p:ExcludeByAttribute=\"TestSDKAutoGeneratedCode,AutoGeneratedCode\" " \
"/p:ExcludeByAttribute=\"TestSDKAutoGeneratedCode,AutoGeneratedCode\"" \
"/p:CollectCoverage=true" \
"/p:CoverletOutput=../TestResults/" \
"/p:MergeWith=../TestResults/coverage.net9.0.json" \
"/p:MergeWith=../TestResults/coverage.net10.0.json" \
"/p:CoverletOutputFormat=\"json\""
dotnet test --no-build Test.J3DI.Infrastructure.EntityFactoryFx/Test.J3DI.Infrastructure.EntityFactoryFx.csproj --framework net9.0 --logger:trx --results-directory ../TestResults \
dotnet test --no-build Test.J3DI.Infrastructure.EntityFactoryFx/Test.J3DI.Infrastructure.EntityFactoryFx.csproj --framework net10.0 --logger:trx --results-directory ../TestResults \
"/p:Exclude=\"[Test.J3DI.*]*\"" \
"/p:ExcludeByAttribute=\"TestSDKAutoGeneratedCode,AutoGeneratedCode\" " \
"/p:ExcludeByAttribute=\"TestSDKAutoGeneratedCode,AutoGeneratedCode\"" \
"/p:CollectCoverage=true" \
"/p:CoverletOutput=../TestResults/" \
"/p:MergeWith=../TestResults/coverage.net9.0.json" \
"/p:MergeWith=../TestResults/coverage.net10.0.json" \
"/p:CoverletOutputFormat=\"json\""
dotnet test --no-build Test.J3DI.Infrastructure.RepositoryFx/Test.J3DI.Infrastructure.RepositoryFx.csproj --framework net9.0 --logger:trx --results-directory ../TestResults \
dotnet test --no-build Test.J3DI.Infrastructure.RepositoryFx/Test.J3DI.Infrastructure.RepositoryFx.csproj --framework net10.0 --logger:trx --results-directory ../TestResults \
"/p:Exclude=\"[Test.J3DI.*]*\"" \
"/p:ExcludeByAttribute=\"TestSDKAutoGeneratedCode,AutoGeneratedCode\" " \
"/p:ExcludeByAttribute=\"TestSDKAutoGeneratedCode,AutoGeneratedCode\"" \
"/p:CollectCoverage=true" \
"/p:CoverletOutput=../TestResults/" \
"/p:MergeWith=../TestResults/coverage.net9.0.json" \
"/p:MergeWith=../TestResults/coverage.net10.0.json" \
"/p:CoverletOutputFormat=\"json,cobertura\""


cover-report:
reportgenerator \
-targetdir:coveragereport/net9.0 \
"-reports:./TestResults/coverage.net9.0.cobertura.xml"
-targetdir:coveragereport/net10.0 \
"-reports:./TestResults/coverage.net10.0.cobertura.xml"


coveralls-report:
coveralls report --format=cobertura TestResults/coverage.net9.0.cobertura.xml --repo-token=XK3p5o0AoS4H838oiS9bvVwz4ibcLIkvp
coveralls report --format=cobertura TestResults/coverage.net10.0.cobertura.xml --repo-token=XK3p5o0AoS4H838oiS9bvVwz4ibcLIkvp
# coveralls report --format=lcov Test.J3DI.Domain/coverage.net8.0.info --repo-token=XK3p5o0AoS4H838oiS9bvVwz4ibcLIkvp
# coveralls report --format=lcov Test.J3DI.Infrastructure.RepositoryFx/coverage.net8.0.info --repo-token=XK3p5o0AoS4H838oiS9bvVwz4ibcLIkvp
# coveralls report --format=lcov Test.J3DI.Infrastructure.EntityFactoryFx/coverage.net8.0.info --repo-token=XK3p5o0AoS4H838oiS9bvVwz4ibcLIkvp
Expand Down
4 changes: 2 additions & 2 deletions common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<!-- Company, copyright -->
<PropertyGroup>
<Copyright>AltaModa Technologies 2016-2025</Copyright>
<Copyright>AltaModa Technologies 2016-2026</Copyright>
<Company>AltaModa Technologies</Company>
<Authors>@jburnett</Authors>
</PropertyGroup>


<!-- Assembly version & attribute controls -->
<PropertyGroup>
<VersionPrefix>4.4.0</VersionPrefix>
<VersionPrefix>10.0.0</VersionPrefix>

<GenerateAssemblyConfigurationAttribute>true</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>true</GenerateAssemblyCompanyAttribute>
Expand Down
2 changes: 1 addition & 1 deletion common.test.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<!-- Target frameworks -->
<PropertyGroup>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
</PropertyGroup>


Expand Down