Skip to content

Commit d182501

Browse files
committed
chore: Bump to net10
1 parent 0948dee commit d182501

11 files changed

Lines changed: 30 additions & 235 deletions

.github/workflows/runtime-ci.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ 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'
1919
GitVersion_Version: 5.10.3
2020

@@ -98,7 +98,7 @@ jobs:
9898
build_aot_linux_job:
9999
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
100100
runs-on: ubuntu-latest
101-
container: 'mcr.microsoft.com/dotnet/sdk:8.0.303-jammy'
101+
container: 'mcr.microsoft.com/dotnet/sdk:10.0-noble'
102102

103103
strategy:
104104
matrix:
@@ -125,7 +125,7 @@ jobs:
125125
- name: Setup .NET SDK
126126
uses: actions/setup-dotnet@v1.7.2
127127
with:
128-
dotnet-version: 8.0.303
128+
dotnet-version: 10.0.100
129129

130130
- name: Setup .NET SDK
131131
uses: actions/setup-dotnet@v1.7.2
@@ -206,7 +206,7 @@ jobs:
206206
build_linux_job:
207207
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
208208
runs-on: ubuntu-latest
209-
container: 'mcr.microsoft.com/dotnet/sdk:8.0.303-jammy'
209+
container: 'mcr.microsoft.com/dotnet/sdk:10.0-noble'
210210

211211
strategy:
212212
matrix:
@@ -234,7 +234,7 @@ jobs:
234234
- name: Setup .NET SDK
235235
uses: actions/setup-dotnet@v1.7.2
236236
with:
237-
dotnet-version: 8.0.303
237+
dotnet-version: 10.0.100
238238

239239
- name: Setup .NET SDK
240240
uses: actions/setup-dotnet@v1.7.2
@@ -297,9 +297,11 @@ jobs:
297297
cd ./runtime/artifacts/packages/Release/Shipping
298298
rm *.symbols.nupkg
299299
rm *.Templates.*.nupkg
300-
rm *ToolChain.net6.Manifest*.nupkg
301-
rm *ToolChain.net7.Manifest*.nupkg
302-
rm *ToolChain.net8.Manifest*.nupkg
300+
rm -f *ToolChain.net6.Manifest*.nupkg
301+
rm -f *ToolChain.net7.Manifest*.nupkg
302+
rm -f *ToolChain.net8.Manifest*.nupkg
303+
rm -f *ToolChain.net9.Manifest*.nupkg
304+
rm -f *ToolChain.net10.Manifest*.nupkg
303305
unzip -o '*.nupkg' -d uno
304306
cd uno
305307
rm *.nuspec
@@ -352,7 +354,7 @@ jobs:
352354
- name: Setup .NET SDK
353355
uses: actions/setup-dotnet@v1.7.2
354356
with:
355-
dotnet-version: 8.0.303
357+
dotnet-version: 10.0.100
356358

357359
- name: Download package
358360
uses: actions/download-artifact@v2

nuget/runtime/buildTransitive/uno.netcore.app.runtime.mono.browser-wasm.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Property overrides -->
44
<PropertyGroup>
55
<_UnoNetCoreAppRuntimeBasePath>$(MSBuildThisFileDirectory)../data/singlethread/</_UnoNetCoreAppRuntimeBasePath>
6-
<_UnoNetCoreAppRuntimeTaskPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_UnoNetCoreAppRuntimeBasePath)..\tasks\net9.0\</_UnoNetCoreAppRuntimeTaskPath>
6+
<_UnoNetCoreAppRuntimeTaskPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_UnoNetCoreAppRuntimeBasePath)..\tasks\net10.0\</_UnoNetCoreAppRuntimeTaskPath>
77
<_UnoNetCoreAppRuntimeTaskPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(_UnoNetCoreAppRuntimeBasePath)..\tasks\net472\</_UnoNetCoreAppRuntimeTaskPath>
88

99
<WasmAppBuilderTasksAssemblyPath>$(_UnoNetCoreAppRuntimeTaskPath)WasmAppBuilder.dll</WasmAppBuilderTasksAssemblyPath>
@@ -16,9 +16,9 @@
1616
<PropertyGroup>
1717
<MicrosoftNetCoreAppRuntimePackDir>$(_UnoNetCoreAppRuntimeBasePath)runtimes\browser-wasm\</MicrosoftNetCoreAppRuntimePackDir>
1818
<MicrosoftNetCoreAppRuntimePackRidDir>$(_UnoNetCoreAppRuntimeBasePath)runtimes\browser-wasm\</MicrosoftNetCoreAppRuntimePackRidDir>
19-
<MicrosoftNetCoreAppRuntimePackRidLibTfmDir>$(_UnoNetCoreAppRuntimeBasePath)runtimes\browser-wasm\lib\net9.0\</MicrosoftNetCoreAppRuntimePackRidLibTfmDir>
19+
<MicrosoftNetCoreAppRuntimePackRidLibTfmDir>$(_UnoNetCoreAppRuntimeBasePath)runtimes\browser-wasm\lib\net10.0\</MicrosoftNetCoreAppRuntimePackRidLibTfmDir>
2020

21-
<WasmAppBuilderTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_UnoNetCoreAppRuntimeBasePath)tasks\net9.0\WasmAppBuilder.dll</WasmAppBuilderTasksAssemblyPath>
21+
<WasmAppBuilderTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_UnoNetCoreAppRuntimeBasePath)tasks\net10.0\WasmAppBuilder.dll</WasmAppBuilderTasksAssemblyPath>
2222
<WasmAppBuilderTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(_UnoNetCoreAppRuntimeBasePath)tasks\net472\WasmAppBuilder.dll</WasmAppBuilderTasksAssemblyPath>
2323
</PropertyGroup>
2424

patches/.gitkeep

Whitespace-only changes.

patches/0001-enable-idbfs.patch

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

patches/0002-chore-Add-browser-wasm-packages.patch

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

patches/0003-chore-make-blazor.boot.json-file-configurable.patch

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

patches/0004-dev-server-debug.patch.debug

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

patches/0005-fix-additional-emscripten-exports.patch

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

patches/0006-chore-Enable-stack-profiling.patch

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

patches/0013-fix-adjust-require-global-imports.patch

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

0 commit comments

Comments
 (0)