From 5196f544bee1e6434cb11344cb8f6987752e2685 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome@platform.uno>
Date: Wed, 4 Sep 2024 07:14:35 -0400
Subject: [PATCH] chore: Adjust base .NET Version

---
 build/ci/dotnet-install.yml          | 10 +++++-----
 build/ci/stage-build-linux-tests.yml | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/build/ci/dotnet-install.yml b/build/ci/dotnet-install.yml
index cd39c1a..39a0aff 100644
--- a/build/ci/dotnet-install.yml
+++ b/build/ci/dotnet-install.yml
@@ -3,11 +3,11 @@ parameters:
 
 steps:
 
-  # - task: UseDotNet@2
-  #   displayName: 'Use .NET 6 SDK'
-  #   inputs:
-  #     version: ${{ parameters.DotNetVersion }}
-  #     includePreviewVersions: true
+  - task: UseDotNet@2
+    displayName: 'Use .NET SDK'
+    inputs:
+      version: ${{ parameters.DotNetVersion }}
+      includePreviewVersions: true
 
   - pwsh: |
       $DotNetRoot = "$env:ProgramFiles\dotnet\"
diff --git a/build/ci/stage-build-linux-tests.yml b/build/ci/stage-build-linux-tests.yml
index b600c9a..951f992 100644
--- a/build/ci/stage-build-linux-tests.yml
+++ b/build/ci/stage-build-linux-tests.yml
@@ -27,17 +27,17 @@ jobs:
 
   - bash: |
       cd $(build.sourcesdirectory)/src/Uno.Wasm.Bootstrap
-      dotnet msbuild /r /p:Configuration=Release /p:DISABLE_CLIHOST_NET6=true
+      dotnet msbuild /r /p:Configuration=Release
     displayName: Build bootstrap
 
   - bash: |
       cd $(build.sourcesdirectory)/src
-      dotnet publish -c Release /m:1 /p:DISABLE_CLIHOST_NET6=true Uno.Wasm.Bootstrap-netcore-only.slnf /bl:$(build.artifactstagingdirectory)/SampleNet5.binlog
+      dotnet publish -c Release /m:1 Uno.Wasm.Bootstrap-netcore-only.slnf /bl:$(build.artifactstagingdirectory)/SampleNet5.binlog
     displayName: Build NetCore-Wasm Sample
 
   - task: CopyFiles@2
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net6.0/publish
+      SourceFolder: $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer/bin/Release/net9.0/publish/wwwroot
       Contents: '**/*.*'
       TargetFolder: $(build.artifactstagingdirectory)/Uno.Wasm.Sample.RayTracer
       CleanTargetFolder: false
@@ -56,8 +56,8 @@ jobs:
   ## Threads Interp validation
   - bash: |
       cd $(build.sourcesdirectory)/src/Uno.Wasm.Threads
-      dotnet clean -c Release /p:DISABLE_CLIHOST_NET6=true
-      dotnet publish -c Release /m:1 /p:DISABLE_CLIHOST_NET6=true "/p:WasmShellWebAppBasePath=/"
+      dotnet clean -c Release
+      dotnet publish -c Release /m:1 "/p:WasmShellWebAppBasePath=/"
     displayName: Build Threads test
 
   - bash: |
@@ -71,8 +71,8 @@ jobs:
   ### Threads AOT validation
   - bash: |
       cd $(build.sourcesdirectory)/src/Uno.Wasm.Threads.Aot
-      dotnet clean -c Release /p:DISABLE_CLIHOST_NET6=true
-      dotnet publish -c Release /m:1 /p:DISABLE_CLIHOST_NET6=true "/p:WasmShellWebAppBasePath=/"
+      dotnet clean -c Release
+      dotnet publish -c Release /m:1 "/p:WasmShellWebAppBasePath=/"
     displayName: Build Threads AOT test
   
   - bash: |
@@ -86,8 +86,8 @@ jobs:
   ## SWA sub-path validation
   - bash: |
       cd $(build.sourcesdirectory)/src/Uno.Wasm.Sample.RayTracer
-      dotnet clean -c Release /p:DISABLE_CLIHOST_NET6=true
-      dotnet publish -c Release /m:1 /p:DISABLE_CLIHOST_NET6=true "/p:WasmShellWebAppBasePath=/"
+      dotnet clean -c Release
+      dotnet publish -c Release /m:1 "/p:WasmShellWebAppBasePath=/"
     displayName: Build RayTracer with sub-path
 
   - task: CopyFiles@2
@@ -163,8 +163,8 @@ jobs:
   # Interpreter debug for symbols copy issue
   - bash: |
       cd $(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.Interpreter
-      dotnet clean -c Debug /p:DISABLE_CLIHOST_NET6=true
-      dotnet publish -c Debug /m:1 /p:DISABLE_CLIHOST_NET6=true /p:WasmShellEmccLinkOptimization=false /bl:$(build.artifactstagingdirectory)/sample.debug-interpreter-linux-debug.binlog
+      dotnet clean -c Debug
+      dotnet publish -c Debug /m:1 /p:WasmShellEmccLinkOptimization=false /bl:$(build.artifactstagingdirectory)/sample.debug-interpreter-linux-debug.binlog
     displayName: Build Debug Interpreter with linking Sample
 
   - task: PublishBuildArtifacts@1