Skip to content

Commit 9d59f34

Browse files
authored
Merge pull request #905 from unoplatform/dev/jela/net10
chore: Move to net10, enable daily validation
2 parents c84523b + 0830be7 commit 9d59f34

File tree

8 files changed

+51
-43
lines changed

8 files changed

+51
-43
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
- main
1212
- release/*
1313

14+
schedule:
15+
- cron: '0 0 * * *' # every day at midnight
16+
1417
jobs:
1518
build_and_deploy_job:
1619
env:
@@ -38,21 +41,21 @@ jobs:
3841
useConfigFile: true
3942
configFilePath: gitversion.yml
4043

41-
# Daily builds install
42-
# - run: |
43-
# wget https://dot.net/v1/dotnet-install.sh
44-
# chmod +x dotnet-install.sh
45-
# ./dotnet-install.sh -c 9.0 -q daily
46-
# echo ~/.dotnet >> $GITHUB_PATH
47-
#
48-
# name: Setup .NET
49-
#
44+
# Daily builds .NET
45+
- run: |
46+
wget https://dot.net/v1/dotnet-install.sh
47+
chmod +x dotnet-install.sh
48+
./dotnet-install.sh -c 10.0 -q daily
49+
echo ~/.dotnet >> $GITHUB_PATH
50+
51+
name: Setup .NET
52+
5053
51-
- name: Setup .NET
52-
uses: actions/[email protected]
53-
with:
54-
dotnet-version: '9.0.100-rc.2.24474.11'
55-
include-prerelease: true
54+
# - name: Setup .NET
55+
# uses: actions/[email protected]
56+
# with:
57+
# dotnet-version: '9.0.100-rc.2.24474.11'
58+
# include-prerelease: true
5659

5760
- run: |
5861
cd src

.vsts-ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ pr:
1212
- release/stable/*
1313
- feature/*
1414

15+
variables:
16+
# disabled for now as the default has changed for net10
17+
NUGET_CERT_REVOCATION_MODE: offline
18+
1519
stages:
1620
- stage: Determine_Changes
1721
displayName: Determine Changes

build/ci/dotnet-install.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@ parameters:
33

44
steps:
55

6-
- task: UseDotNet@2
7-
displayName: 'Use .NET SDK'
8-
inputs:
9-
version: ${{ parameters.DotNetVersion }}
10-
includePreviewVersions: true
6+
# - task: UseDotNet@2
7+
# displayName: 'Use .NET SDK'
8+
# inputs:
9+
# version: ${{ parameters.DotNetVersion }}
10+
# includePreviewVersions: true
1111

1212
# Daily builds install
13-
# - pwsh: |
14-
# $DotNetRoot = "C:\hostedtoolcache\windows\dotnet"
15-
# Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "./build/installcli.ps1"
16-
# & ./build/installcli.ps1 -c 9.0 -q daily -InstallDir $DotNetRoot
17-
18-
# condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))
19-
# displayName: 'Setup .NET (Windows)'
20-
21-
# - pwsh: |
22-
# wget https://dot.net/v1/dotnet-install.sh
23-
# chmod +x dotnet-install.sh
24-
# ./dotnet-install.sh -c 9.0 -q daily
25-
# echo "[task.setvariable variable=PATH;]${env:PATH}:$env:HOME/.dotnet"
26-
# echo "[task.setvariable variable=DOTNET_ROOT;]$env:HOME/.dotnet"
27-
28-
# echo "##vso[task.setvariable variable=PATH;]$env:HOME/.dotnet:${env:PATH}"
29-
# echo "##vso[task.setvariable variable=DOTNET_ROOT;]$env:HOME/.dotnet"
30-
31-
# condition: and(succeeded(), ne( variables['Agent.OS'], 'Windows_NT' ))
32-
# displayName: 'Setup .NET (Linux/macOS)'
13+
- pwsh: |
14+
$DotNetRoot = "C:\hostedtoolcache\windows\dotnet"
15+
Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "./build/installcli.ps1"
16+
& ./build/installcli.ps1 -c 10.0 -q daily -InstallDir $DotNetRoot
17+
18+
condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))
19+
displayName: 'Setup .NET (Windows)'
20+
21+
- pwsh: |
22+
wget https://dot.net/v1/dotnet-install.sh
23+
chmod +x dotnet-install.sh
24+
./dotnet-install.sh -c 10.0 -q daily
25+
echo "[task.setvariable variable=PATH;]${env:PATH}:$env:HOME/.dotnet"
26+
echo "[task.setvariable variable=DOTNET_ROOT;]$env:HOME/.dotnet"
27+
28+
echo "##vso[task.setvariable variable=PATH;]$env:HOME/.dotnet:${env:PATH}"
29+
echo "##vso[task.setvariable variable=DOTNET_ROOT;]$env:HOME/.dotnet"
30+
31+
condition: and(succeeded(), ne( variables['Agent.OS'], 'Windows_NT' ))
32+
displayName: 'Setup .NET (Linux/macOS)'
3333
3434
- pwsh: |
3535
cd src

build/scripts/run-tests-csp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export BOOTSTRAP_TEST_RUNNER_URL=$3
1313
# install dotnet serve / Remove as needed
1414
dotnet tool uninstall dotnet-serve -g || true
1515
dotnet tool uninstall dotnet-serve --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
16-
dotnet tool install dotnet-serve --version 1.10.140 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
16+
dotnet tool install dotnet-serve --version 1.10.175 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
1717
export PATH="$PATH:$BUILD_SOURCESDIRECTORY/build/tools"
1818

1919
cd $BOOTSTRAP_APP_PATH

build/scripts/run-tests-windows.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dotnet tool install dotnet-serve --version 1.10.140 --tool-path $BUILD_SOURCESDIRECTORY\build\tools
1+
dotnet tool install dotnet-serve --version 1.10.175 --tool-path $BUILD_SOURCESDIRECTORY\build\tools
22
$env:PATH="$env:PATH;$BUILD_SOURCESDIRECTORY\build\tools"
33

44
$BOOTSTRAP_APP_PATH=$args[0]

build/scripts/run-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export BOOTSTRAP_TEST_RUNNER_URL=$3
1313
# install dotnet serve / Remove as needed
1414
dotnet tool uninstall dotnet-serve -g || true
1515
dotnet tool uninstall dotnet-serve --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
16-
dotnet tool install dotnet-serve --version 1.10.140 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
16+
dotnet tool install dotnet-serve --version 1.10.175 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
1717
export PATH="$PATH:$BUILD_SOURCESDIRECTORY/build/tools"
1818

1919
cd $BOOTSTRAP_APP_PATH

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
</Target>
320320

321321
<Target Name="GenerateUnoWasmAssets"
322-
BeforeTargets="ResolveStaticWebAssetsInputs;ResolveJSModuleStaticWebAssets;_UnoWasmNativeForBuild"
322+
BeforeTargets="ResolveStaticWebAssetsInputs;ResolveJSModuleStaticWebAssets;ResolveJsInitializerModuleStaticWebAssets;_UnoWasmNativeForBuild"
323323
DependsOnTargets="_UnoAdjustCompatibility">
324324

325325
<ItemGroup>

src/Uno.Wasm.StaticLinking.Server.net7/Uno.Wasm.StaticLinking.Server.net7.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
6+
<RollForward>major</RollForward>
67
</PropertyGroup>
78

89
<ItemGroup>

0 commit comments

Comments
 (0)