Skip to content

Commit 04dc306

Browse files
EiderenVaclavEliasKryptos-FR
authored
chore: Update to dotnet 10 (#2888)
Co-authored-by: Vaclav Elias <4528464+VaclavElias@users.noreply.github.com> Co-authored-by: Nicolas Musset <musset.nicolas@gmail.com>
1 parent b3cbfb9 commit 04dc306

127 files changed

Lines changed: 481 additions & 603 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/build-android.yml‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,42 @@ jobs:
5151
lfs: true
5252
- uses: actions/setup-dotnet@v4
5353
with:
54-
dotnet-version: '8.0.x'
54+
dotnet-version: '10.0.x'
55+
- name: Install Android Workload
56+
run: dotnet workload install android
57+
- name: Remove Conflicting NDK
58+
shell: pwsh
59+
run: |
60+
$conflictingNdk = "C:\Android\android-sdk\ndk\26.3.11579264"
61+
if (Test-Path $conflictingNdk) {
62+
Write-Host "Removing conflicting NDK 26.3.11579264"
63+
Remove-Item -Path $conflictingNdk -Recurse -Force
64+
}
65+
- name: Setup Android
66+
uses: android-actions/setup-android@v3
67+
with:
68+
cmdline-tools-version: 12266719
69+
accept-android-sdk-licenses: true
70+
log-accepted-android-sdk-licenses: true
71+
packages: tools platform-tools ndk;21.4.7075529
72+
- name: Configure NDK Environment
73+
shell: pwsh
74+
run: |
75+
$ndkPath = "$env:ANDROID_SDK_ROOT\ndk\21.4.7075529"
76+
echo "ANDROID_NDK_ROOT=$ndkPath" >> $env:GITHUB_ENV
77+
echo "ANDROID_NDK_HOME=$ndkPath" >> $env:GITHUB_ENV
78+
echo "Using NDK at: $ndkPath"
5579
- uses: microsoft/setup-msbuild@v2
80+
- name: Debug NDK Configuration
81+
shell: pwsh
82+
run: |
83+
Write-Host "ANDROID_SDK_ROOT: $env:ANDROID_SDK_ROOT"
84+
Write-Host "ANDROID_NDK_ROOT: $env:ANDROID_NDK_ROOT"
85+
Write-Host "ANDROID_NDK_HOME: $env:ANDROID_NDK_HOME"
86+
Write-Host "NDK Path exists: $(Test-Path $env:ANDROID_NDK_ROOT)"
87+
if (Test-Path "$env:ANDROID_NDK_ROOT\source.properties") {
88+
Get-Content "$env:ANDROID_NDK_ROOT\source.properties"
89+
}
5690
- name: Build
5791
run: |
5892
msbuild build\Stride.Android.sln `
@@ -61,4 +95,5 @@ jobs:
6195
-p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
6296
-p:StridePlatforms=Android `
6397
-p:StrideSkipUnitTests=true `
64-
-p:StrideSkipAutoPack=true
98+
-p:StrideSkipAutoPack=true `
99+
-p:_AndroidNdkDirectory="$env:ANDROID_NDK_ROOT"

‎.github/workflows/build-assembly-processor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
lfs: true
4848
- uses: actions/setup-dotnet@v4
4949
with:
50-
dotnet-version: '8.0.x'
50+
dotnet-version: '10.0.x'
5151
- name: Build
5252
run: |
5353
dotnet build build\Stride.AssemblyProcessor.sln `

‎.github/workflows/build-ios.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ jobs:
5151
lfs: true
5252
- uses: actions/setup-dotnet@v4
5353
with:
54-
dotnet-version: '8.0.x'
54+
dotnet-version: '10.0.x'
55+
- name: Install .NET iOS Workload
56+
run: dotnet workload install ios
5557
- uses: microsoft/setup-msbuild@v2
5658
- name: Build
5759
run: |

‎.github/workflows/build-launcher.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
lfs: true
5050
- uses: actions/setup-dotnet@v4
5151
with:
52-
dotnet-version: '8.0.x'
52+
dotnet-version: '10.0.x'
5353
- uses: microsoft/setup-msbuild@v2
5454
- name: Build
5555
run: |

‎.github/workflows/build-linux-runtime.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
lfs: true
6262
- uses: actions/setup-dotnet@v4
6363
with:
64-
dotnet-version: '8.0.x'
64+
dotnet-version: '10.0.x'
6565
- uses: microsoft/setup-msbuild@v2
6666
- name: Build
6767
run: |

‎.github/workflows/build-vs-package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
lfs: true
4747
- uses: actions/setup-dotnet@v4
4848
with:
49-
dotnet-version: '8.0.x'
49+
dotnet-version: '10.0.x'
5050
- uses: microsoft/setup-msbuild@v2
5151
- name: Build
5252
run: |

‎.github/workflows/build-windows-full.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
lfs: true
4747
- uses: actions/setup-dotnet@v4
4848
with:
49-
dotnet-version: '8.0.x'
49+
dotnet-version: '10.0.x'
5050
- uses: microsoft/setup-msbuild@v2
5151
- name: Build
5252
run: |

‎.github/workflows/build-windows-runtime.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
lfs: true
6565
- uses: actions/setup-dotnet@v4
6666
with:
67-
dotnet-version: '8.0.x'
67+
dotnet-version: '10.0.x'
6868
- uses: microsoft/setup-msbuild@v2
6969
- name: Build
7070
run: |

‎.github/workflows/test-linux.yml‎

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,50 @@ jobs:
4444
lfs: true
4545
- uses: actions/setup-dotnet@v4
4646
with:
47-
dotnet-version: '8.0.x'
47+
dotnet-version: '10.0.x'
48+
- name: Install Build Dependencies
49+
run: |
50+
sudo apt-get update
51+
sudo apt-get install -y libbsd-dev clang llvm lld
52+
- name: Patch NativePath for Linux
53+
run: |
54+
# Make strlcat_chk and strlcpy_chk non-fatal on Linux
55+
sed -i 's/#if !__has_builtin(__builtin___strlcat_chk)/#if !__has_builtin(__builtin___strlcat_chk) \&\& !defined(__linux__)/' deps/NativePath/NativePath.h
56+
sed -i 's/#if !__has_builtin(__builtin___strlcpy_chk)/#if !__has_builtin(__builtin___strlcpy_chk) \&\& !defined(__linux__)/' deps/NativePath/NativePath.h
57+
# This step isn't needed, it adds another NuGet soruce
58+
# - name: Configure NuGet Sources
59+
# run: |
60+
# # Get absolute path to local packages
61+
# LOCAL_PACKAGES_PATH="$(pwd)/bin/packages"
62+
63+
# # Only add the local source (not the non-existent global one)
64+
# dotnet nuget add source "$LOCAL_PACKAGES_PATH" --name "StrideDev Local"
65+
66+
# # List configured sources
67+
# echo "==== Configured NuGet Sources ===="
68+
# dotnet nuget list source
4869
- name: Build
4970
run: |
50-
dotnet build build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf `
51-
-restore -m:1 -nr:false `
52-
-v:m -p:WarningLevel=0 `
53-
-p:Configuration=${{ github.event.inputs.build-type || inputs.build-type }} `
54-
-p:StridePlatforms=Linux `
55-
-p:StrideGraphicsApis=OpenGL
71+
dotnet build build/Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf \
72+
-restore -m:1 -nr:false \
73+
-v:m -p:WarningLevel=0 \
74+
-p:Configuration=${{ github.event.inputs.build-type || inputs.build-type }} \
75+
-p:StridePlatforms=Linux \
76+
-p:StrideGraphicsApis=OpenGL \
77+
# This step isn't needed, it lists the NuGet sources again
78+
# - name: Inspect NuGet Local Sources (always)
79+
# if: always()
80+
# run: |
81+
# echo "==== NuGet Sources (dotnet) ===="
82+
# dotnet nuget list source || true
83+
# echo
84+
# echo "==== Working Directory ===="
85+
# pwd
86+
# echo
87+
# echo "==== StrideDev Local ./bin/packages ===="
88+
# if [ -d ./bin/packages ]; then find ./bin/packages -maxdepth 2 -type f -printf '%P\n' | head -200; else echo "Directory not found"; fi
5689
- name: Test
5790
run: |
58-
dotnet test build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf `
59-
--no-build `
91+
dotnet test build/Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf \
92+
--no-build \
6093
-p:Configuration=${{ github.event.inputs.build-type || inputs.build-type }}

‎.github/workflows/test-windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
lfs: true
5858
- uses: actions/setup-dotnet@v4
5959
with:
60-
dotnet-version: '8.0.x'
60+
dotnet-version: '10.0.x'
6161
- uses: microsoft/setup-msbuild@v2
6262
- name: Build
6363
run: |

0 commit comments

Comments
 (0)