Merge pull request #905 from unoplatform/dev/jela/net10

chore: Move to net10, enable daily validation
unoplatform · Oct 25, 2024 · 9d59f34 · 9d59f34
2 parents c84523b + 0830be7
commit 9d59f34
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 43 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,6 +11,9 @@ on:
       - main
       - release/*
 
+  schedule:
+    - cron: '0 0 * * *' # every day at midnight
+
 jobs:
   build_and_deploy_job:
     env:
@@ -38,21 +41,21 @@ jobs:
           useConfigFile: true
           configFilePath: gitversion.yml
 
-      # Daily builds install
-      # - run: |
-      #     wget https://dot.net/v1/dotnet-install.sh
-      #     chmod +x dotnet-install.sh
-      #     ./dotnet-install.sh -c 9.0 -q daily
-      #     echo ~/.dotnet >> $GITHUB_PATH
-      # 
-      #   name: Setup .NET
-      #     
+      # Daily builds .NET
+      - run: |
+          wget https://dot.net/v1/dotnet-install.sh
+          chmod +x dotnet-install.sh
+          ./dotnet-install.sh -c 10.0 -q daily
+          echo ~/.dotnet >> $GITHUB_PATH
+      
+        name: Setup .NET
+          
 
-      - name: Setup .NET
-        uses: actions/[email protected]
-        with:
-          dotnet-version: '9.0.100-rc.2.24474.11'
-          include-prerelease: true
+      # - name: Setup .NET
+      #   uses: actions/[email protected]
+      #   with:
+      #     dotnet-version: '9.0.100-rc.2.24474.11'
+      #     include-prerelease: true
 
       - run: |
           cd src

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -12,6 +12,10 @@ pr:
       - release/stable/*
       - feature/*
 
+variables:
+  # disabled for now as the default has changed for net10
+  NUGET_CERT_REVOCATION_MODE: offline
+
 stages:
 - stage: Determine_Changes
   displayName: Determine Changes

diff --git a/build/ci/dotnet-install.yml b/build/ci/dotnet-install.yml
@@ -3,33 +3,33 @@ parameters:
 
 steps:
 
-  - task: UseDotNet@2
-    displayName: 'Use .NET SDK'
-    inputs:
-      version: ${{ parameters.DotNetVersion }}
-      includePreviewVersions: true
+  # - task: UseDotNet@2
+  #   displayName: 'Use .NET SDK'
+  #   inputs:
+  #     version: ${{ parameters.DotNetVersion }}
+  #     includePreviewVersions: true
 
   # Daily builds install
-  # - pwsh: |
-  #     $DotNetRoot = "C:\hostedtoolcache\windows\dotnet"
-  #     Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "./build/installcli.ps1"
-  #     & ./build/installcli.ps1 -c 9.0 -q daily -InstallDir $DotNetRoot
-
-  #   condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))
-  #   displayName: 'Setup .NET (Windows)'
-
-  # - pwsh: |
-  #     wget https://dot.net/v1/dotnet-install.sh
-  #     chmod +x dotnet-install.sh
-  #     ./dotnet-install.sh -c 9.0 -q daily
-  #     echo "[task.setvariable variable=PATH;]${env:PATH}:$env:HOME/.dotnet"
-  #     echo "[task.setvariable variable=DOTNET_ROOT;]$env:HOME/.dotnet"
-
-  #     echo "##vso[task.setvariable variable=PATH;]$env:HOME/.dotnet:${env:PATH}"
-  #     echo "##vso[task.setvariable variable=DOTNET_ROOT;]$env:HOME/.dotnet"
-
-  #   condition: and(succeeded(), ne( variables['Agent.OS'], 'Windows_NT' ))
-  #   displayName: 'Setup .NET (Linux/macOS)'
+  - pwsh: |
+      $DotNetRoot = "C:\hostedtoolcache\windows\dotnet"
+      Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "./build/installcli.ps1"
+      & ./build/installcli.ps1 -c 10.0 -q daily -InstallDir $DotNetRoot
+
+    condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))
+    displayName: 'Setup .NET (Windows)'
+
+  - pwsh: |
+      wget https://dot.net/v1/dotnet-install.sh
+      chmod +x dotnet-install.sh
+      ./dotnet-install.sh -c 10.0 -q daily
+      echo "[task.setvariable variable=PATH;]${env:PATH}:$env:HOME/.dotnet"
+      echo "[task.setvariable variable=DOTNET_ROOT;]$env:HOME/.dotnet"
+
+      echo "##vso[task.setvariable variable=PATH;]$env:HOME/.dotnet:${env:PATH}"
+      echo "##vso[task.setvariable variable=DOTNET_ROOT;]$env:HOME/.dotnet"
+
+    condition: and(succeeded(), ne( variables['Agent.OS'], 'Windows_NT' ))
+    displayName: 'Setup .NET (Linux/macOS)'
 
   - pwsh: |
       cd src

diff --git a/build/scripts/run-tests-csp.sh b/build/scripts/run-tests-csp.sh
@@ -13,7 +13,7 @@ export BOOTSTRAP_TEST_RUNNER_URL=$3
 # install dotnet serve / Remove as needed
 dotnet tool uninstall dotnet-serve -g || true
 dotnet tool uninstall dotnet-serve --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
-dotnet tool install dotnet-serve --version 1.10.140 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
+dotnet tool install dotnet-serve --version 1.10.175 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
 export PATH="$PATH:$BUILD_SOURCESDIRECTORY/build/tools"
 
 cd $BOOTSTRAP_APP_PATH

diff --git a/build/scripts/run-tests-windows.ps1 b/build/scripts/run-tests-windows.ps1
@@ -1,4 +1,4 @@
-dotnet tool install dotnet-serve --version 1.10.140 --tool-path $BUILD_SOURCESDIRECTORY\build\tools
+dotnet tool install dotnet-serve --version 1.10.175 --tool-path $BUILD_SOURCESDIRECTORY\build\tools
 $env:PATH="$env:PATH;$BUILD_SOURCESDIRECTORY\build\tools"
 
 $BOOTSTRAP_APP_PATH=$args[0]

diff --git a/build/scripts/run-tests.sh b/build/scripts/run-tests.sh
@@ -13,7 +13,7 @@ export BOOTSTRAP_TEST_RUNNER_URL=$3
 # install dotnet serve / Remove as needed
 dotnet tool uninstall dotnet-serve -g || true
 dotnet tool uninstall dotnet-serve --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
-dotnet tool install dotnet-serve --version 1.10.140 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
+dotnet tool install dotnet-serve --version 1.10.175 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
 export PATH="$PATH:$BUILD_SOURCESDIRECTORY/build/tools"
 
 cd $BOOTSTRAP_APP_PATH

diff --git a/src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets b/src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets
@@ -319,7 +319,7 @@
 	</Target>
 
 	<Target Name="GenerateUnoWasmAssets"
-		BeforeTargets="ResolveStaticWebAssetsInputs;ResolveJSModuleStaticWebAssets;_UnoWasmNativeForBuild"
+		BeforeTargets="ResolveStaticWebAssetsInputs;ResolveJSModuleStaticWebAssets;ResolveJsInitializerModuleStaticWebAssets;_UnoWasmNativeForBuild"
 		DependsOnTargets="_UnoAdjustCompatibility">
 
 		<ItemGroup>

diff --git a/src/Uno.Wasm.StaticLinking.Server.net7/Uno.Wasm.StaticLinking.Server.net7.csproj b/src/Uno.Wasm.StaticLinking.Server.net7/Uno.Wasm.StaticLinking.Server.net7.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
+		<RollForward>major</RollForward>
   </PropertyGroup>
 
   <ItemGroup>