Skip to content

[DMS-884] .Net 10 migration #775

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
simpat-adam wants to merge 10 commits into
base: main
Choose a base branch
from
Open

[DMS-884] .Net 10 migration #775

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bb6bf27
.Net 10 Migration
simpat-adam Dec 15, 2025
31805c9
Fix issue due to form binding change
simpat-adam Dec 15, 2025
a629d26
Code scanning fixes
simpat-adam Dec 15, 2025
b2d38e6
Test fixups
simpat-adam Dec 15, 2025
7a6cdf3
Fix SDK generator .net target
simpat-adam Dec 15, 2025
4fc42c4
Fix SDK generator .net target
simpat-adam Dec 15, 2025
570b97f
switched to the newer Alpine 3.23 base image
simpat-adam Dec 15, 2025
1256497
Pin SHA digests
simpat-adam Dec 16, 2025
1e07b98
Remove working scratchpad
simpat-adam Dec 16, 2025
2d87d38
Re-pin alpine packages
simpat-adam Dec 16, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

- name: Dependency Review ("Dependabot on PR")
if: ${{ github.event_name == 'pull_request' && !github.event.repository.fork }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on-cli-generator-pullrequest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Build
run: ./build-cli-generator.ps1 Build -Configuration ${{ env.CONFIGURATION }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/on-config-pullrequest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

- name: Build
run: ./build-config.ps1 Build -Configuration ${{ env.CONFIGURATION }}
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

- name: Build
run: ./build-config.ps1 Build -Configuration ${{ env.CONFIGURATION }}
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

- name: Build
run: ./build-config.ps1 Build -Configuration ${{ env.CONFIGURATION }} -IdentityProvider ${{matrix.identityprovider}}
Expand All @@ -178,7 +178,7 @@ jobs:
with:
name: test-logs
path: |
./src/services/EdFi.DmsConfigurationService.Api.Tests.E2E/bin/Release/net8.0/logs
./src/services/EdFi.DmsConfigurationService.Api.Tests.E2E/bin/Release/net10.0/logs
retention-days: 10

- name: Upload Test Results
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/on-dms-pullrequest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Build
run: ./build-dms.ps1 Build -Configuration ${{ env.CONFIGURATION }}
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Build
run: ./build-dms.ps1 Build -Configuration ${{ env.CONFIGURATION }}
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Build
run: ./build-dms.ps1 Build -Configuration ${{ env.CONFIGURATION }} -IdentityProvider ${{matrix.identityprovider}}
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Build
run: ./build-dms.ps1 Build -Configuration ${{ env.CONFIGURATION }}
Expand Down Expand Up @@ -395,7 +395,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Build
run: ./build-dms.ps1 Build -Configuration ${{ env.CONFIGURATION }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on-prerelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

- name: Set DMS Version Numbers
id: versions
Expand Down Expand Up @@ -344,7 +344,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

- name: Set Config Version Numbers
id: versions
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scheduled-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Cache Nuget packages
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Build
run: ./build-dms.ps1 Build -Configuration ${{ env.CONFIGURATION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-pre-image-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

- name: Cache Nuget packages
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 #v4.2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/scheduled-smoke-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Cache NuGet packages
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
- name: Verify SDK Generation
run: |
Write-Host "Checking SDK generation results..."
$sdkPath = "${{ github.workspace }}/eng/sdkGen/csharp/src/EdFi.DmsApi.TestSdk/bin/Release/net8.0/EdFi.DmsApi.TestSdk.dll"
$sdkPath = "${{ github.workspace }}/eng/sdkGen/csharp/src/EdFi.DmsApi.TestSdk/bin/Release/net10.0/EdFi.DmsApi.TestSdk.dll"
Write-Host "Expected SDK path: $sdkPath"

if (Test-Path $sdkPath) {
Expand Down Expand Up @@ -158,12 +158,12 @@ jobs:

- name: Run NonDestructive DMS SDK Tests
run: |
./Invoke-NonDestructiveSdkTests.ps1 -BaseUrl "http://localhost:8080" -Key "$env:SMOKE_TEST_KEY" -Secret "$env:SMOKE_TEST_SECRET" -SdkPath "${{ github.workspace }}/eng/sdkGen/csharp/src/EdFi.DmsApi.TestSdk/bin/Release/net8.0/EdFi.DmsApi.TestSdk.dll"
./Invoke-NonDestructiveSdkTests.ps1 -BaseUrl "http://localhost:8080" -Key "$env:SMOKE_TEST_KEY" -Secret "$env:SMOKE_TEST_SECRET" -SdkPath "${{ github.workspace }}/eng/sdkGen/csharp/src/EdFi.DmsApi.TestSdk/bin/Release/net10.0/EdFi.DmsApi.TestSdk.dll"
working-directory: eng/smoke_test/

- name: Run Destructive DMS SDK Tests
run: |
./Invoke-DestructiveSdkTests.ps1 -BaseUrl "http://localhost:8080" -Key "$env:SMOKE_TEST_KEY" -Secret "$env:SMOKE_TEST_SECRET" -SdkPath "${{ github.workspace }}/eng/sdkGen/csharp/src/EdFi.DmsApi.TestSdk/bin/Release/net8.0/EdFi.DmsApi.TestSdk.dll"
./Invoke-DestructiveSdkTests.ps1 -BaseUrl "http://localhost:8080" -Key "$env:SMOKE_TEST_KEY" -Secret "$env:SMOKE_TEST_SECRET" -SdkPath "${{ github.workspace }}/eng/sdkGen/csharp/src/EdFi.DmsApi.TestSdk/bin/Release/net10.0/EdFi.DmsApi.TestSdk.dll"
working-directory: eng/smoke_test/

- name: Run NonDestructive ODS SDK Tests
Expand Down
4 changes: 2 additions & 2 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "DMS",
"program": "${workspaceFolder}\\src\\dms\\frontend\\EdFi.DataManagementService.Frontend.AspNetCore\\bin\\Debug\\net8.0\\EdFi.DataManagementService.Frontend.AspNetCore.dll",
"program": "${workspaceFolder}\\src\\dms\\frontend\\EdFi.DataManagementService.Frontend.AspNetCore\\bin\\Debug\\net10.0\\EdFi.DataManagementService.Frontend.AspNetCore.dll",
"args": [],
"cwd": "${workspaceFolder}\\src\\dms\\frontend\\EdFi.DataManagementService.Frontend.AspNetCore",
"stopAtEntry": false,
Expand All @@ -28,7 +28,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "Config",
"program": "${workspaceFolder}\\src\\config\\frontend\\EdFi.DmsConfigurationService.Frontend.AspNetCore\\bin\\Debug\\net8.0\\EdFi.DmsConfigurationService.Frontend.AspNetCore.dll",
"program": "${workspaceFolder}\\src\\config\\frontend\\EdFi.DmsConfigurationService.Frontend.AspNetCore\\bin\\Debug\\net10.0\\EdFi.DmsConfigurationService.Frontend.AspNetCore.dll",
"args": [],
"cwd": "${workspaceFolder}\\src\\config\\frontend\\EdFi.DmsConfigurationService.Frontend.AspNetCore",
"stopAtEntry": false,
Expand Down
4 changes: 2 additions & 2 deletions build-cli-generator.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ function RunTests {
$Filter
)

$testAssemblyPath = "$solutionRoot/$Filter/bin/$Configuration/net8.0/"
$testAssemblyPath = "$solutionRoot/$Filter/bin/$Configuration/net10.0/"
$testAssemblies = Get-ChildItem -Path $testAssemblyPath -Filter "$Filter.dll" -ErrorAction SilentlyContinue |
Sort-Object -Property { $_.Name.Length }

Expand Down Expand Up @@ -263,7 +263,7 @@ function RunSchemaGenerator {
$Arguments
)

$exePath = "$cliProjectRoot/bin/$Configuration/net8.0/$projectName.exe"
$exePath = "$cliProjectRoot/bin/$Configuration/net10.0/$projectName.exe"

if (!(Test-Path $exePath)) {
Write-Warning "Schema Generator CLI executable not found at $exePath"
Expand Down
2 changes: 1 addition & 1 deletion build-sdk.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function GenerateSdk {
--model-package $ModelPackage `
-o $OutputFolder `
--operation-id-name-mappings $mappings `
--additional-properties "packageName=$PackageName,targetFramework=net8.0,netCoreProjectFile=true" `
--additional-properties "packageName=$PackageName,targetFramework=net10.0,netCoreProjectFile=true" `
--global-property modelTests=false `
--global-property apiTests=false `
--global-property apiDocs=false `
Expand Down
Loading
Loading