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

feat: Bump to net10

Author: jeromelaban

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ on:
 jobs:
   build_and_deploy_job:
     env:
-      DIST_PATH: src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot
+      DIST_PATH: src/Uno.Wasm.Sample.RayTracer/bin/Release/net10.0/publish/wwwroot
 
     if: (github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'schedule'
     runs-on: ubuntu-latest
@@ -28,38 +28,32 @@ jobs:
         with:
           fetch-depth: 0 # Required for gitversion
           submodules: true
-          
-      - name: Install GitVersion
-        uses: gittools/actions/gitversion/[email protected]
-        with:
-          versionSpec: '5.x'
-          
-      - name: Determine Version
-        id: gitversion
-        uses: gittools/actions/gitversion/[email protected]
-        with:
-          useConfigFile: true
-          configFilePath: gitversion.yml
-          
+
       # 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
-      
+        if: github.event_name == 'schedule'
         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]
+        if: github.event_name == 'pull_request'
+        with:
+          dotnet-version: '10.0.100-preview.3.25201.16'
+          include-prerelease: true
+
+      - uses: dotnet/nbgv@f088059084cb5d872e9d1a994433ca6440c2bf72 # v0.4.2
+        id: nbgv
+        with:
+          toolVersion: 3.6.139
+          setAllVars: true
 
       - run: |
           cd src
-          dotnet workload install wasm-tools wasm-tools-net9
+          dotnet workload install wasm-tools
       
         name: Setup Workloads
 

build/ci/cspell.json

@@ -49,6 +49,7 @@
 		"MVUX",
 		"MVVM",
 		"NETSDK",
+		"NBGV",
 		"netstandard",
 		"oidc",
 		"Omnisharp",

build/ci/dotnet-install.yml

@@ -1,31 +1,31 @@
 parameters:
-  DotNetVersion: '9.0.100-rc.2.24474.11'
+  DotNetVersion: '10.0.100-preview.3.25201.16'
 
 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 -v 10.0.100-preview.2.25164.34 -InstallDir $DotNetRoot
+  # - pwsh: |
+  #     $DotNetRoot = "C:\hostedtoolcache\windows\dotnet"
+  #     Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "./build/installcli.ps1"
+  #     & ./build/installcli.ps1 -v 10.0.100-preview.3.25201.16 -InstallDir $DotNetRoot
 
-    condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))
-    displayName: 'Setup .NET (Windows)'
+  #   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 -v 10.0.100-preview.2.25164.34
+      ./dotnet-install.sh -v 10.0.100-preview.3.25201.16
       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=PATH;]$env:HOME/.dotnet:$env:HOME/.dotnet/tools:${env:PATH}"
       echo "##vso[task.setvariable variable=DOTNET_ROOT;]$env:HOME/.dotnet"
 
     condition: and(succeeded(), ne( variables['Agent.OS'], 'Windows_NT' ))
@@ -35,6 +35,6 @@ steps:
       cd src
       dotnet --version
       dotnet --list-sdks
-      dotnet workload install wasm-tools wasm-tools-net9
+      dotnet workload install wasm-tools
 
     displayName: Setup Workloads

build/ci/gitversion.yml

@@ -1,24 +1,16 @@
 steps:
-  - task: UseDotNet@2
-    displayName: 'Use .NET'
-    inputs:
-      packageType: runtime
-      version: 5.0.3
+- pwsh: |
+    dotnet tool uninstall nbgv -g
+    dotnet tool install nbgv -g --version 3.6.139
+    nbgv cloud -a
+  displayName: Version with NBGV
+  name: NBGV
 
-  - task: UseDotNet@2
-    displayName: 'Use .NET'
-    inputs:
-      packageType: runtime
-      version: 6.0.0
+- pwsh: |
+    $InformationalVersion="$(NBGV_SemVer2)+$(NBGV_GitCommitId)-$(NBGV_BuildingRef)".Replace("refs/heads/","").Replace("/","-")
+    echo "##vso[task.setvariable variable=NBGV_InformationalVersion;]$InformationalVersion"
+    echo "##vso[task.setvariable variable=NBGV_InformationalVersion;isOutput=true;]$InformationalVersion"
+    echo "Informational Version: $InformationalVersion"
 
-  - task: gitversion/setup@0
-    inputs:
-      versionSpec: '5.10.3'
-
-  - task: gitversion/execute@0
-    inputs:
-      updateAssemblyInfo: 'False'
-      useConfigFile: true
-      configFilePath: $(build.sourcesdirectory)/gitversion.yml
-
-    displayName: Run GitVersion
+  displayName: Generate Informational Version
+  name: NBGV_InformationalVersion

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

@@ -23,8 +23,8 @@ jobs:
   - checkout: self
     clean: true
 
-  - template: gitversion.yml
   - template: dotnet-install.yml
+  - template: gitversion.yml
 
   - bash: |
       cd $(build.sourcesdirectory)/src/Uno.Wasm.Bootstrap
@@ -38,7 +38,7 @@ jobs:
 
   - task: CopyFiles@2
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot
+      SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net10.0/publish/wwwroot
       Contents: '**/*.*'
       TargetFolder: $(build.artifactstagingdirectory)/Uno.Wasm.Sample.RayTracer
       CleanTargetFolder: false
@@ -48,7 +48,7 @@ jobs:
   ## Raytracer validation
   - bash: |
       $(build.sourcesdirectory)/build/scripts/run-tests.sh \
-        "$(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot" \
+        "$(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net10.0/publish/wwwroot" \
         "$(build.sourcesdirectory)/src/WasmAot.UITests" "http://localhost:8000/"
     displayName: Raytracer UI Tests Net5
     env:
@@ -63,7 +63,7 @@ jobs:
 
   - bash: |
       $(build.sourcesdirectory)/build/scripts/run-tests.sh \
-        "$(build.sourcesdirectory)/src/Uno.Wasm.Threads/bin/Release/net9.0/publish/wwwroot" \
+        "$(build.sourcesdirectory)/src/Uno.Wasm.Threads/bin/Release/net10.0/publish/wwwroot" \
         "$(build.sourcesdirectory)/src/Uno.Wasm.Threading.UITests" "http://localhost:8000/"
     displayName: Threading UI Tests 
     condition: eq( variables['THREAD_TESTING'], 'true' )
@@ -79,7 +79,7 @@ jobs:
   
   - bash: |
       $(build.sourcesdirectory)/build/scripts/run-tests.sh \
-        "$(build.sourcesdirectory)/src/Uno.Wasm.Threads.Aot/bin/Release/net9.0/publish/wwwroot" \
+        "$(build.sourcesdirectory)/src/Uno.Wasm.Threads.Aot/bin/Release/net10.0/publish/wwwroot" \
         "$(build.sourcesdirectory)/src/Uno.Wasm.Threading.UITests" "http://localhost:8000/"
     displayName: Threading AOT UI Tests 
     condition: eq( variables['THREAD_TESTING'], 'true' )
@@ -95,7 +95,7 @@ jobs:
 
   - task: CopyFiles@2
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot
+      SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net10.0/publish/wwwroot
       Contents: '**/*.*'
       TargetFolder: $(build.artifactstagingdirectory)/subpath-override
       CleanTargetFolder: false
@@ -104,7 +104,7 @@ jobs:
 
   - bash: |
       $(build.sourcesdirectory)/build/scripts/run-tests-swa.sh \
-        "$(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot" \
+        "$(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net10.0/publish/wwwroot" \
         "$(build.sourcesdirectory)/src/WasmAot.UITests" "http://localhost:8000/test/inner"
     displayName: Raytracer UI Tests Net5 (SWA)
     env:
@@ -113,7 +113,7 @@ jobs:
   ## Static linking validation
   - bash: |
       $(build.sourcesdirectory)/build/scripts/run-tests.sh \
-        "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.Net6/bin/Release/net9.0/publish/wwwroot" \
+        "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.Net6/bin/Release/net10.0/publish/wwwroot" \
         "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.UITests" "http://localhost:8000/"
     displayName: StaticLinking.Aot Tests net5
     env:
@@ -122,7 +122,7 @@ jobs:
   ## Static linking validation (net7)
   - bash: |
       $(build.sourcesdirectory)/build/scripts/run-tests.sh \
-        "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7/bin/Release/net9.0/publish/wwwroot" \
+        "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7/bin/Release/net10.0/publish/wwwroot" \
         "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.UITests" "http://localhost:8000/"
     displayName: StaticLinking.Aot Tests net7
     env:
@@ -138,7 +138,7 @@ jobs:
   ## Static linking validation (net7)
   - bash: |
       $(build.sourcesdirectory)/build/scripts/run-tests-csp.sh \
-        "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7/bin/Release/net9.0/publish/wwwroot" \
+        "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7/bin/Release/net10.0/publish/wwwroot" \
         "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.UITests" "http://localhost:8000/"
     displayName: StaticLinking.Aot Tests net7 (CSP Enabled)
     env:
@@ -156,7 +156,7 @@ jobs:
   - task: CopyFiles@2
     condition: always()
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Server.net7/bin/Release/net9.0
+      SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Server.net7/bin/Release/net10.0
       Contents: '**/*.*'
       TargetFolder: $(build.artifactstagingdirectory)/Uno.Wasm.StaticLinking.Server.net7
       CleanTargetFolder: false

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

@@ -13,8 +13,8 @@ jobs:
     SourceLinkEnabled: false
 
   steps:
-  - template: gitversion.yml
   - template: dotnet-install.yml
+  - template: gitversion.yml
 
   - bash: |
       cd $(build.sourcesdirectory)/src/Uno.Wasm.Bootstrap
@@ -35,7 +35,7 @@ jobs:
 
   - bash: |
       $(build.sourcesdirectory)/build/scripts/run-tests.sh \
-        "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Interpreter/bin/Release/net9.0/publish/wwwroot" \
+        "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Interpreter/bin/Release/net10.0/publish/wwwroot" \
         "$(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Aot.UITests" "http://localhost:8000/"
     displayName: StaticLinking Interpreter Test
     env:

build/ci/stage-build-packages.yml

@@ -11,8 +11,8 @@ jobs:
   - checkout: self
     clean: true
 
-  - template: gitversion.yml
   - template: dotnet-install.yml
+  - template: gitversion.yml
 
   - bash: |
       npm install -g [email protected]
@@ -35,7 +35,7 @@ jobs:
 
   - script: |
       cd $(build.sourcesdirectory)\src
-      dotnet msbuild Uno.Wasm.Bootstrap-packages-only.slnf /r /p:Configuration=Release /p:InformationalVersion=$(GITVERSION.INFORMATIONALVERSION) /p:PackageReleaseNotesFile=$(Build.SourcesDirectory)/build/CHANGELOG.md /p:PackageVersion=$(GITVERSION.FullSemVer) /p:PackageOutputPath=$(build.sourcesdirectory)\build\nuget /bl:$(build.artifactstagingdirectory)/win-packages.binlog
+      dotnet msbuild Uno.Wasm.Bootstrap-packages-only.slnf /r /p:Configuration=Release /p:InformationalVersion=$(NBGV_InformationalVersion) /p:PackageReleaseNotesFile=$(Build.SourcesDirectory)/build/CHANGELOG.md /p:PackageVersion=$(NBGV_SemVer2) /p:PackageOutputPath=$(build.sourcesdirectory)\build\nuget /bl:$(build.artifactstagingdirectory)/win-packages.binlog
     displayName: Build packages
 
   - script: |
@@ -71,7 +71,7 @@ jobs:
       ArtifactType: Container
 
   - script: |
-      dotnet msbuild /r /bl /m:1 /p:Configuration=Release /p:DISABLE_CLIHOST_NET6=true /p:InformationalVersion=$(GITVERSION.INFORMATIONALVERSION) /p:PackageVersion=$(GITVERSION.FullSemVer) /p:PackageOutputPath=$(build.sourcesdirectory)\build\nuget $(build.sourcesdirectory)/src/Uno.Wasm.Bootstrap-msbuild-only.slnf /bl:$(build.artifactstagingdirectory)/win-validation-binaries.binlog
+      dotnet msbuild /r /bl /m:1 /p:Configuration=Release /p:DISABLE_CLIHOST_NET6=true /p:InformationalVersion=$(NBGV_InformationalVersion) /p:PackageVersion=$(NBGV_SemVer2) /p:PackageOutputPath=$(build.sourcesdirectory)\build\nuget $(build.sourcesdirectory)/src/Uno.Wasm.Bootstrap-msbuild-only.slnf /bl:$(build.artifactstagingdirectory)/win-validation-binaries.binlog
 
     displayName: Build Validation Binaries