Skip to content

Commit 9bd2247

Browse files
jeromelabanjeromelaban
authored
chore: Bump to net10 (#150)
* chore: Bump to net10 * chore: Adjust GHA * chore: Fix publish * chore: Adjust versioning * chore: Adjust for versioning * chore: Adjust ngbv
1 parent 0948dee commit 9bd2247

16 files changed

Lines changed: 132 additions & 379 deletions

‎.github/workflows/runtime-ci.yml‎

Lines changed: 59 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ on:
1313
- release/**
1414

1515
env:
16-
DOTNETRUNTIME_COMMIT: be32947d322ae71526ad1dde412a1dca44ea4fba
17-
DOTNETSDK_VERSION: 9.0.100-preview.6.24328.19
16+
DOTNETRUNTIME_COMMIT: 081d220c0a773ffb7c6bea6b48727833576a65ef
17+
DOTNETSDK_VERSION: 10.0.100
1818
ADDITIONAL_BUILD_ARGS: '/p:MonoEnableAssertMessages=true /p:WasmEnableES6=true /p:WasmExceptionHandling=true'
19-
GitVersion_Version: 5.10.3
19+
NBGV_VERSION: 3.9.50
2020

2121
concurrency:
2222
group: ${{github.workflow}} - ${{github.ref}} - ${{github.event_name}}
@@ -36,27 +36,15 @@ jobs:
3636

3737
steps:
3838
- name: Setup .NET SDK
39-
uses: actions/setup-dotnet@v1.7.2
39+
uses: actions/setup-dotnet@v4
4040
with:
4141
dotnet-version: ${{ env.DOTNETSDK_VERSION }}
4242

43-
- uses: actions/checkout@v2
43+
- uses: actions/checkout@v4
4444
with:
4545
submodules: true
4646
fetch-depth: 0
4747

48-
- name: Setup GitVersion
49-
uses: gittools/actions/gitversion/setup@v0.9.9
50-
with:
51-
versionSpec: ${{ env.GitVersion_Version }}
52-
53-
- name: GitVersion
54-
id: gitversion
55-
uses: gittools/actions/gitversion/execute@v0.9.9
56-
with:
57-
useConfigFile: true
58-
configFilePath: build/gitversion.yml
59-
6048
- name: Update variables
6149
run: |
6250
echo "BUILD_CONFIGURATION=${{ matrix.BUILD_CONFIGURATION }}" >> $env:GITHUB_ENV
@@ -84,12 +72,12 @@ jobs:
8472
move $env:GITHUB_WORKSPACE\runtime\artifacts\bin\mono\Browser.wasm.Release\cross $env:GITHUB_WORKSPACE/nuget/tools
8573
8674
cd $env:GITHUB_WORKSPACE/nuget
87-
dotnet pack Uno.NETCore.App.Runtime.AOT.Cross.browser-wasm.csproj /p:OutputPath=$env:GITHUB_WORKSPACE\ci-output "/p:Version=${{ steps.gitversion.outputs.semVer }}"
75+
dotnet pack Uno.NETCore.App.Runtime.AOT.Cross.browser-wasm.csproj /p:OutputPath=$env:GITHUB_WORKSPACE\ci-output
8876
89-
- uses: actions/upload-artifact@v2
77+
- uses: actions/upload-artifact@v4
9078
if: ${{ always() }}
9179
with:
92-
name: nuget
80+
name: nuget-aot-windows
9381
path: ci-output
9482

9583
##
@@ -98,40 +86,28 @@ jobs:
9886
build_aot_linux_job:
9987
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
10088
runs-on: ubuntu-latest
101-
container: 'mcr.microsoft.com/dotnet/sdk:8.0.303-jammy'
89+
container: 'mcr.microsoft.com/dotnet/sdk:10.0-noble'
10290

10391
strategy:
10492
matrix:
10593
BUILD_CONFIGURATION: [Release]
10694

10795
steps:
108-
- uses: actions/checkout@v2
96+
- uses: actions/checkout@v4
10997
with:
11098
submodules: true
11199
fetch-depth: 0
112100

113-
- name: Setup GitVersion
114-
uses: gittools/actions/gitversion/setup@v0.9.9
115-
with:
116-
versionSpec: ${{ env.GitVersion_Version }}
117-
118-
- name: GitVersion
119-
id: gitversion
120-
uses: gittools/actions/gitversion/execute@v0.9.9
121-
with:
122-
useConfigFile: true
123-
configFilePath: build/gitversion.yml
124-
125101
- name: Setup .NET SDK
126-
uses: actions/setup-dotnet@v1.7.2
102+
uses: actions/setup-dotnet@v4
127103
with:
128-
dotnet-version: 8.0.303
104+
dotnet-version: 10.0.100
129105

130106
- name: Setup .NET SDK
131-
uses: actions/setup-dotnet@v1.7.2
107+
uses: actions/setup-dotnet@v4
132108
with:
133109
dotnet-version: ${{ env.DOTNETSDK_VERSION }}
134-
110+
135111
- name: Install dependencies
136112
run: |
137113
set -e
@@ -154,7 +130,7 @@ jobs:
154130
155131
- name: Trust My Directory
156132
run: git config --global --add safe.directory /__w/Uno.DotnetRuntime.WebAssembly/Uno.DotnetRuntime.WebAssembly
157-
133+
158134
- name: Set Variable from current Commit
159135
run: |
160136
set -e
@@ -192,12 +168,12 @@ jobs:
192168
cp -R $GITHUB_WORKSPACE/runtime/artifacts/bin/mono/browser.wasm.Release/cross/browser-wasm/* $GITHUB_WORKSPACE/nuget/tools
193169
194170
cd $GITHUB_WORKSPACE/nuget
195-
dotnet pack Uno.NETCore.App.Runtime.AOT.Cross.browser-wasm.csproj /p:OutputPath=$GITHUB_WORKSPACE/ci-output "/p:Version=${{ steps.gitversion.outputs.semVer }}"
171+
dotnet pack Uno.NETCore.App.Runtime.AOT.Cross.browser-wasm.csproj /p:OutputPath=$GITHUB_WORKSPACE/ci-output
196172
197-
- uses: actions/upload-artifact@v2
173+
- uses: actions/upload-artifact@v4
198174
if: ${{ always() }}
199175
with:
200-
name: nuget
176+
name: nuget-aot-linux
201177
path: ci-output
202178

203179
##
@@ -206,41 +182,29 @@ jobs:
206182
build_linux_job:
207183
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
208184
runs-on: ubuntu-latest
209-
container: 'mcr.microsoft.com/dotnet/sdk:8.0.303-jammy'
185+
container: 'mcr.microsoft.com/dotnet/sdk:10.0-noble'
210186

211187
strategy:
212188
matrix:
213189
BUILD_CONFIGURATION: [Release]
214190
MONO_WASM_THREADS: ['multithread', 'singlethread']
215191

216192
steps:
217-
- uses: actions/checkout@v2
193+
- uses: actions/checkout@v4
218194
with:
219195
submodules: true
220196
fetch-depth: 0
221197

222-
- name: Setup GitVersion
223-
uses: gittools/actions/gitversion/setup@v0.9.9
224-
with:
225-
versionSpec: ${{ env.GitVersion_Version }}
226-
227-
- name: GitVersion
228-
id: gitversion
229-
uses: gittools/actions/gitversion/execute@v0.9.9
230-
with:
231-
useConfigFile: true
232-
configFilePath: build/gitversion.yml
233-
234198
- name: Setup .NET SDK
235-
uses: actions/setup-dotnet@v1.7.2
199+
uses: actions/setup-dotnet@v4
236200
with:
237-
dotnet-version: 8.0.303
201+
dotnet-version: 10.0.100
238202

239203
- name: Setup .NET SDK
240-
uses: actions/setup-dotnet@v1.7.2
204+
uses: actions/setup-dotnet@v4
241205
with:
242206
dotnet-version: ${{ env.DOTNETSDK_VERSION }}
243-
207+
244208
- name: Install dependencies
245209
run: |
246210
set -e
@@ -264,7 +228,7 @@ jobs:
264228
265229
- name: Trust My Directory
266230
run: git config --global --add safe.directory /__w/Uno.DotnetRuntime.WebAssembly/Uno.DotnetRuntime.WebAssembly
267-
231+
268232
- name: Set Variable from current Commit
269233
run: |
270234
set -e
@@ -297,9 +261,11 @@ jobs:
297261
cd ./runtime/artifacts/packages/Release/Shipping
298262
rm *.symbols.nupkg
299263
rm *.Templates.*.nupkg
300-
rm *ToolChain.net6.Manifest*.nupkg
301-
rm *ToolChain.net7.Manifest*.nupkg
302-
rm *ToolChain.net8.Manifest*.nupkg
264+
rm -f *ToolChain.net6.Manifest*.nupkg
265+
rm -f *ToolChain.net7.Manifest*.nupkg
266+
rm -f *ToolChain.net8.Manifest*.nupkg
267+
rm -f *ToolChain.net9.Manifest*.nupkg
268+
rm -f *ToolChain.net10.Manifest*.nupkg
303269
unzip -o '*.nupkg' -d uno
304270
cd uno
305271
rm *.nuspec
@@ -321,61 +287,60 @@ jobs:
321287
cd ./runtime/artifacts/packages/Release/Shipping/uno
322288
/usr/bin/zip -r $ARTIFACTS_FOLDER/sdk-${{ matrix.MONO_WASM_THREADS }}.zip *
323289
324-
- uses: actions/upload-artifact@v2
290+
- uses: actions/upload-artifact@v4
325291
if: ${{ always() }}
326292
with:
327-
name: wasm-sdk
293+
name: wasm-sdk-${{ matrix.MONO_WASM_THREADS }}
328294
path: ci-artifacts
329295

330296
package_job:
331297
needs: [build_linux_job]
332298
runs-on: ubuntu-latest
333299

334300
steps:
335-
- uses: actions/checkout@v2
301+
- uses: actions/checkout@v4
336302
with:
337303
submodules: true
338304
fetch-depth: 0
339305

340-
- name: Setup GitVersion
341-
uses: gittools/actions/gitversion/setup@v0.9.9
306+
- name: Setup .NET SDK
307+
uses: actions/setup-dotnet@v4
342308
with:
343-
versionSpec: ${{ env.GitVersion_Version }}
309+
dotnet-version: 10.0.100
344310

345-
- name: GitVersion
346-
id: gitversion
347-
uses: gittools/actions/gitversion/execute@v0.9.9
348-
with:
349-
useConfigFile: true
350-
configFilePath: build/gitversion.yml
311+
- name: Install nbgv
312+
run: |
313+
dotnet tool uninstall --global nbgv || true
314+
dotnet tool install --global nbgv --version ${{ env.NBGV_VERSION }}
351315
352-
- name: Setup .NET SDK
353-
uses: actions/setup-dotnet@v1.7.2
354-
with:
355-
dotnet-version: 8.0.303
316+
- name: Get version
317+
id: nbgv
318+
run: |
319+
echo "SemVer2=$(nbgv get-version -v SemVer2)" >> $GITHUB_OUTPUT
356320
357321
- name: Download package
358-
uses: actions/download-artifact@v2
322+
uses: actions/download-artifact@v4
359323
with:
360-
name: wasm-sdk
324+
pattern: wasm-sdk-*
361325
path: nuget
326+
merge-multiple: true
362327

363328
- name: Create NuGet SDK Packages
364329
run: |
365330
cd nuget
366331
367332
# Adjust version numbers for target files
368-
sed -i "s/\\\$buildversion\\\$/${{ steps.gitversion.outputs.semVer }}/g" runtime/buildTransitive/*
333+
sed -i "s/\\\$buildversion\\\$/${{ steps.nbgv.outputs.SemVer2 }}/g" runtime/buildTransitive/*
369334
370335
# Unzip all packages in separate folders
371336
find . -name '*.zip' -exec sh -c 'unzip -d "${1%.*}" "$1"' _ {} \;
372337
373-
dotnet pack Uno.NETCore.App.Runtime.Mono.browser-wasm.csproj /p:OutputPath=$GITHUB_WORKSPACE/ci-output "/p:Version=${{ steps.gitversion.outputs.semVer }}"
338+
dotnet pack Uno.NETCore.App.Runtime.Mono.browser-wasm.csproj /p:OutputPath=$GITHUB_WORKSPACE/ci-output
374339
375-
- uses: actions/upload-artifact@v2
340+
- uses: actions/upload-artifact@v4
376341
if: ${{ always() }}
377342
with:
378-
name: nuget
343+
name: nuget-sdk
379344
path: ci-output
380345

381346
sign:
@@ -385,16 +350,17 @@ jobs:
385350
needs: [package_job,build_aot_windows_job,build_aot_linux_job]
386351
steps:
387352
- name: Checkout
388-
uses: actions/checkout@v2
353+
uses: actions/checkout@v4
389354

390355
- name: Download Artifacts
391-
uses: actions/download-artifact@v2
356+
uses: actions/download-artifact@v4
392357
with:
393-
name: nuget
358+
pattern: nuget-*
394359
path: artifacts
360+
merge-multiple: true
395361

396362
- name: Setup .NET SDK
397-
uses: actions/setup-dotnet@v1
363+
uses: actions/setup-dotnet@v4
398364
with:
399365
dotnet-version: '3.1.x'
400366

@@ -408,7 +374,7 @@ jobs:
408374
build\SignClient sign -i artifacts\*.nupkg -c build\signing\SignClient.json -r "${{ secrets.UNO_PLATFORM_CODESIGN_USERNAME }}" -s "${{ secrets.UNO_PLATFORM_CODESIGN_SECRET }}" -n "dotnet runtime" -d "dotnet runtime" -u "https://github.dev/unoplatform/Uno.DotnetRuntime.WebAssembly"
409375
410376
- name: Upload Signed Artifacts
411-
uses: actions/upload-artifact@v2
377+
uses: actions/upload-artifact@v4
412378
with:
413379
name: nuget-signed
414380
path: .\artifacts
@@ -423,7 +389,7 @@ jobs:
423389

424390
steps:
425391
- name: Download Artifacts
426-
uses: actions/download-artifact@v2
392+
uses: actions/download-artifact@v4
427393
with:
428394
name: nuget-signed
429395
path: artifacts
@@ -444,7 +410,7 @@ jobs:
444410

445411
steps:
446412
- name: Download Artifacts
447-
uses: actions/download-artifact@v2
413+
uses: actions/download-artifact@v4
448414
with:
449415
name: nuget-signed
450416
path: artifacts

‎build/gitversion.yml‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎nuget/Uno.NETCore.App.Runtime.AOT.Cross.browser-wasm.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<PackageId>Uno.NETCore.App.Runtime.AOT.$(NETCoreSdkPortableRuntimeIdentifier).Cross.browser-wasm</PackageId>
1414
</PropertyGroup>
1515

16+
<ItemGroup>
17+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" PrivateAssets="all" />
18+
</ItemGroup>
19+
1620
<ItemGroup>
1721
<None Include="tools/**" Pack="true" PackagePath="tools" />
1822
</ItemGroup>

0 commit comments

Comments
 (0)