Skip to content

Commit 077cf0b

Browse files
authored
feat: Bump to net10
1 parent 522b44a commit 077cf0b

File tree

36 files changed

+57
-57
lines changed

36 files changed

+57
-57
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
jobs:
1818
build_and_deploy_job:
1919
env:
20-
DIST_PATH: src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot
20+
DIST_PATH: src/Uno.Wasm.Sample.RayTracer/bin/Release/net10.0/publish/wwwroot
2121

2222
if: (github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'schedule'
2323
runs-on: ubuntu-latest

build/ci/dotnet-install.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ steps:
1313
- pwsh: |
1414
$DotNetRoot = "C:\hostedtoolcache\windows\dotnet"
1515
Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "./build/installcli.ps1"
16-
& ./build/installcli.ps1 -v 10.0.100-preview.2.25164.34 -InstallDir $DotNetRoot
16+
& ./build/installcli.ps1 -v 10.0.100-preview.3.25201.16 -InstallDir $DotNetRoot
1717
1818
condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))
1919
displayName: 'Setup .NET (Windows)'
2020
2121
- pwsh: |
2222
wget https://dot.net/v1/dotnet-install.sh
2323
chmod +x dotnet-install.sh
24-
./dotnet-install.sh -v 10.0.100-preview.2.25164.34
24+
./dotnet-install.sh -v 10.0.100-preview.3.25201.16
2525
echo "[task.setvariable variable=PATH;]${env:PATH}:$env:HOME/.dotnet"
2626
echo "[task.setvariable variable=DOTNET_ROOT;]$env:HOME/.dotnet"
2727

build/ci/stage-build-linux-tests.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
3939
- task: CopyFiles@2
4040
inputs:
41-
SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot
41+
SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net10.0/publish/wwwroot
4242
Contents: '**/*.*'
4343
TargetFolder: $(build.artifactstagingdirectory)/Uno.Wasm.Sample.RayTracer
4444
CleanTargetFolder: false
@@ -48,7 +48,7 @@ jobs:
4848
## Raytracer validation
4949
- bash: |
5050
$(build.sourcesdirectory)/build/scripts/run-tests.sh \
51-
"$(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot" \
51+
"$(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net10.0/publish/wwwroot" \
5252
"$(build.sourcesdirectory)/src/WasmAot.UITests" "http://localhost:8000/"
5353
displayName: Raytracer UI Tests Net5
5454
env:
@@ -63,7 +63,7 @@ jobs:
6363
6464
- bash: |
6565
$(build.sourcesdirectory)/build/scripts/run-tests.sh \
66-
"$(build.sourcesdirectory)/src/Uno.Wasm.Threads/bin/Release/net9.0/publish/wwwroot" \
66+
"$(build.sourcesdirectory)/src/Uno.Wasm.Threads/bin/Release/net10.0/publish/wwwroot" \
6767
"$(build.sourcesdirectory)/src/Uno.Wasm.Threading.UITests" "http://localhost:8000/"
6868
displayName: Threading UI Tests
6969
condition: eq( variables['THREAD_TESTING'], 'true' )
@@ -79,7 +79,7 @@ jobs:
7979
8080
- bash: |
8181
$(build.sourcesdirectory)/build/scripts/run-tests.sh \
82-
"$(build.sourcesdirectory)/src/Uno.Wasm.Threads.Aot/bin/Release/net9.0/publish/wwwroot" \
82+
"$(build.sourcesdirectory)/src/Uno.Wasm.Threads.Aot/bin/Release/net10.0/publish/wwwroot" \
8383
"$(build.sourcesdirectory)/src/Uno.Wasm.Threading.UITests" "http://localhost:8000/"
8484
displayName: Threading AOT UI Tests
8585
condition: eq( variables['THREAD_TESTING'], 'true' )
@@ -95,7 +95,7 @@ jobs:
9595
9696
- task: CopyFiles@2
9797
inputs:
98-
SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot
98+
SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net10.0/publish/wwwroot
9999
Contents: '**/*.*'
100100
TargetFolder: $(build.artifactstagingdirectory)/subpath-override
101101
CleanTargetFolder: false
@@ -104,7 +104,7 @@ jobs:
104104

105105
- bash: |
106106
$(build.sourcesdirectory)/build/scripts/run-tests-swa.sh \
107-
"$(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot" \
107+
"$(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net10.0/publish/wwwroot" \
108108
"$(build.sourcesdirectory)/src/WasmAot.UITests" "http://localhost:8000/test/inner"
109109
displayName: Raytracer UI Tests Net5 (SWA)
110110
env:
@@ -113,7 +113,7 @@ jobs:
113113
## Static linking validation
114114
- bash: |
115115
$(build.sourcesdirectory)/build/scripts/run-tests.sh \
116-
"$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.Net6/bin/Release/net9.0/publish/wwwroot" \
116+
"$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.Net6/bin/Release/net10.0/publish/wwwroot" \
117117
"$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.UITests" "http://localhost:8000/"
118118
displayName: StaticLinking.Aot Tests net5
119119
env:
@@ -122,7 +122,7 @@ jobs:
122122
## Static linking validation (net7)
123123
- bash: |
124124
$(build.sourcesdirectory)/build/scripts/run-tests.sh \
125-
"$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7/bin/Release/net9.0/publish/wwwroot" \
125+
"$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7/bin/Release/net10.0/publish/wwwroot" \
126126
"$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.UITests" "http://localhost:8000/"
127127
displayName: StaticLinking.Aot Tests net7
128128
env:
@@ -138,7 +138,7 @@ jobs:
138138
## Static linking validation (net7)
139139
- bash: |
140140
$(build.sourcesdirectory)/build/scripts/run-tests-csp.sh \
141-
"$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7/bin/Release/net9.0/publish/wwwroot" \
141+
"$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7/bin/Release/net10.0/publish/wwwroot" \
142142
"$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.UITests" "http://localhost:8000/"
143143
displayName: StaticLinking.Aot Tests net7 (CSP Enabled)
144144
env:
@@ -156,7 +156,7 @@ jobs:
156156
- task: CopyFiles@2
157157
condition: always()
158158
inputs:
159-
SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Server.net7/bin/Release/net9.0
159+
SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Server.net7/bin/Release/net10.0
160160
Contents: '**/*.*'
161161
TargetFolder: $(build.artifactstagingdirectory)/Uno.Wasm.StaticLinking.Server.net7
162162
CleanTargetFolder: false

build/ci/stage-build-macos-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
3636
- bash: |
3737
$(build.sourcesdirectory)/build/scripts/run-tests.sh \
38-
"$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Interpreter/bin/Release/net9.0/publish/wwwroot" \
38+
"$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Interpreter/bin/Release/net10.0/publish/wwwroot" \
3939
"$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.UITests" "http://localhost:8000/"
4040
displayName: StaticLinking Interpreter Test
4141
env:

build/ci/stage-build-windows-tests.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
4848
- pwsh: |
4949
$(build.sourcesdirectory)\build\scripts\run-tests-windows-server.ps1 `
50-
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Server.net7\bin\Release\net9.0\publish" `
50+
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Server.net7\bin\Release\net10.0\publish" `
5151
"Uno.Wasm.StaticLinking.Server.net7.exe" `
5252
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.UITests" `
5353
"http://localhost:8000/"
@@ -72,7 +72,7 @@ jobs:
7272
7373
- pwsh: |
7474
$(build.sourcesdirectory)\build\scripts\run-tests-windows.ps1 `
75-
"$(build.sourcesdirectory)\src\Uno.Wasm.Sample.RayTracer\bin\Release\net9.0\publish\wwwroot" `
75+
"$(build.sourcesdirectory)\src\Uno.Wasm.Sample.RayTracer\bin\Release\net10.0\publish\wwwroot" `
7676
"$(build.sourcesdirectory)\src\WasmAot.UITests" `
7777
"http://localhost:8000/"
7878
@@ -105,7 +105,7 @@ jobs:
105105
106106
- pwsh: |
107107
$(build.sourcesdirectory)\build\scripts\run-tests-windows.ps1 `
108-
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.Net6\bin\Release\net9.0\publish\wwwroot" `
108+
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.Net6\bin\Release\net10.0\publish\wwwroot" `
109109
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.UITests" `
110110
"http://localhost:8000/"
111111
@@ -122,7 +122,7 @@ jobs:
122122
123123
- pwsh: |
124124
$(build.sourcesdirectory)\build\scripts\run-tests-windows.ps1 `
125-
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.Net6\bin\Release\net9.0\publish\wwwroot" `
125+
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.Net6\bin\Release\net10.0\publish\wwwroot" `
126126
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.UITests" `
127127
"http://localhost:8000/"
128128
@@ -132,7 +132,7 @@ jobs:
132132
133133
- pwsh: |
134134
$(build.sourcesdirectory)\build\scripts\run-tests-windows.ps1 `
135-
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.Net6\bin\Release\net9.0\publish\wwwroot" `
135+
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.Net6\bin\Release\net10.0\publish\wwwroot" `
136136
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.UITests" `
137137
"http://127.0.0.1:8000/"
138138
@@ -149,7 +149,7 @@ jobs:
149149
150150
- pwsh: |
151151
$(build.sourcesdirectory)\build\scripts\run-tests-windows.ps1 `
152-
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.Net6\bin\Release\net9.0\publish\wwwroot" `
152+
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.Net6\bin\Release\net10.0\publish\wwwroot" `
153153
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.UITests" `
154154
"http://localhost:8000/"
155155
@@ -166,7 +166,7 @@ jobs:
166166
167167
- pwsh: |
168168
$(build.sourcesdirectory)\build\scripts\run-tests-windows.ps1 `
169-
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.Net6\bin\Release\net9.0\publish\wwwroot" `
169+
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.Net6\bin\Release\net10.0\publish\wwwroot" `
170170
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.UITests" `
171171
"http://localhost:8000/"
172172
@@ -183,7 +183,7 @@ jobs:
183183
184184
- pwsh: |
185185
$(build.sourcesdirectory)\build\scripts\run-tests-windows.ps1 `
186-
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Net7\bin\Release\net9.0\publish\wwwroot" `
186+
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Net7\bin\Release\net10.0\publish\wwwroot" `
187187
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.UITests" `
188188
"http://localhost:8000/"
189189
@@ -212,7 +212,7 @@ jobs:
212212
213213
- pwsh: |
214214
$(build.sourcesdirectory)\build\scripts\run-tests-windows.ps1 `
215-
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Embedded\bin\Release\net9.0\publish\wwwroot" `
215+
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Embedded\bin\Release\net10.0\publish\wwwroot" `
216216
"$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.UITests" `
217217
"http://localhost:8000/"
218218
@@ -236,7 +236,7 @@ jobs:
236236
237237
- pwsh: |
238238
$(build.sourcesdirectory)\build\scripts\run-tests-windows.ps1 `
239-
"$(build.sourcesdirectory)\src\Uno.Wasm.Threads\bin\Release\net9.0\publish\wwwroot" `
239+
"$(build.sourcesdirectory)\src\Uno.Wasm.Threads\bin\Release\net10.0\publish\wwwroot" `
240240
"$(build.sourcesdirectory)\src\Uno.Wasm.Threading.UITests" `
241241
"http://localhost:8000/"
242242
@@ -254,7 +254,7 @@ jobs:
254254
255255
- pwsh: |
256256
$(build.sourcesdirectory)\build\scripts\run-tests-windows.ps1 `
257-
"$(build.sourcesdirectory)\src\Uno.Wasm.Threads.Aot\bin\Release\net9.0\publish\wwwroot" `
257+
"$(build.sourcesdirectory)\src\Uno.Wasm.Threads.Aot\bin\Release\net10.0\publish\wwwroot" `
258258
"$(build.sourcesdirectory)\src\Uno.Wasm.Threading.UITests" `
259259
"http://localhost:8000/"
260260
displayName: Threading AOT Tests

doc/deploy-and-publish.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ In the command line, to publish the app, use the following:
1212
dotnet publish
1313
```
1414

15-
The app will be located in the `bin/Release/net9.0/publish/wwwroot` folder. More information about `dotnet publish` can be [found in the Microsoft docs](https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-publish).
15+
The app will be located in the `bin/Release/net10.0/publish/wwwroot` folder. More information about `dotnet publish` can be [found in the Microsoft docs](https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-publish).
1616

1717
## Localization publishing
1818

doc/using-the-bootstrapper.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dotnet workload install wasm-tools
2727

2828
<PropertyGroup>
2929
<OutputType>Exe</OutputType>
30-
<TargetFramework>net9.0</TargetFramework>
30+
<TargetFramework>net10.0</TargetFramework>
3131
</PropertyGroup>
3232

3333
<ItemGroup>
@@ -78,7 +78,7 @@ Once installed, launch the server by using the following command:
7878
```bash
7979
cd MyApp.Wasm
8080
dotnet publish -c Debug
81-
dotnet serve -d bin\Debug\net9.0\publish\wwwroot -p 8000
81+
dotnet serve -d bin\Debug\net10.0\publish\wwwroot -p 8000
8282
```
8383

8484
You application will be available `http://localhost:8000`.

src/LongPathTest/Uno.Wasm.LongPath.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767

6868
<!-- Fail the build if the TargetFramework is below 9.0 -->
6969
<Error Condition=" $([MSBuild]::VersionLessThan( $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')), '9.0')) "
70-
Text="This version of Uno.Wasm.Bootstrap is not compatible with $(TargetFramework). Use net9.0 or later, see https://aka.platform.uno/wasm-net9-upgrade for more details." />
70+
Text="This version of Uno.Wasm.Bootstrap is not compatible with $(TargetFramework). Use net10.0 or later, see https://aka.platform.uno/wasm-net9-upgrade for more details." />
7171

7272
</Target>
7373

src/Uno.Wasm.Embedded.App/Uno.Wasm.Embedded.App.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<IsPackable>false</IsPackable>
77
<StartupObject>Uno.Wasm.Sample.Program</StartupObject>

0 commit comments

Comments
 (0)