From 65e950dd7947adaf11793032cc79790a984c0196 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Fri, 12 Jan 2024 23:03:00 +0000
Subject: [PATCH] [ci] Don't install xharness globally (#19863)

* dont install xharness globally

* Fix restore
---
 build.ps1                               | 10 +++++-----
 eng/pipelines/common/maui-templates.yml |  4 ++--
 eng/pipelines/common/variables.yml      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.ps1 b/build.ps1
index 1c9a3a3f8474..251cde9f9f05 100644
--- a/build.ps1
+++ b/build.ps1
@@ -9,11 +9,11 @@ Param(
 )
 
 # Restore Cake tool
-# & dotnet tool restore
-$tools = Get-Content ".config/dotnet-tools.json" | ConvertFrom-Json
-foreach ($tool in $tools.tools.PsObject.Properties) {
-    & dotnet tool install $tool.Name --version $tool.Value.version
-}
+& dotnet tool restore
+# $tools = Get-Content ".config/dotnet-tools.json" | ConvertFrom-Json
+# foreach ($tool in $tools.tools.PsObject.Properties) {
+#     & dotnet tool install $tool.Name --version $tool.Value.version
+# }
 
 # Build Cake arguments
 $cakeArguments = @("$Script");
diff --git a/eng/pipelines/common/maui-templates.yml b/eng/pipelines/common/maui-templates.yml
index 3b9ea064dc81..b3c354350391 100644
--- a/eng/pipelines/common/maui-templates.yml
+++ b/eng/pipelines/common/maui-templates.yml
@@ -157,8 +157,8 @@ jobs:
         DOTNET_TOKEN: $(dotnetbuilds-internal-container-read-token)
         PRIVATE_BUILD: $(PrivateBuild)
 
-    - script: dotnet tool update Microsoft.DotNet.XHarness.CLI --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json --version "8.0.0-prerelease*" -g
-      displayName: install xharness
+    # - script: dotnet tool update Microsoft.DotNet.XHarness.CLI --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json --version "9.0.0-prerelease*" -g
+    #   displayName: install xharness
 
     - pwsh: ./build.ps1 --target=dotnet-integration-build --verbosity=diagnostic
       displayName: Build Microsoft.Maui.IntegrationTests
diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml
index 1e92885b6512..1897f664543f 100644
--- a/eng/pipelines/common/variables.yml
+++ b/eng/pipelines/common/variables.yml
@@ -6,7 +6,7 @@ variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
   value: true
 - name: DOTNET_VERSION
-  value: 7.0.401
+  value: 8.0.101
 - name: REQUIRED_XCODE
   value: 15.2.0
 - name: DEVICETESTS_REQUIRED_XCODE
@@ -52,7 +52,7 @@ variables:
 - name: TeamName
   value: Maui
 - name: POWERSHELL_VERSION
-  value: 7.1.3
+  value: 7.4.0
 - name: Codeql.Enabled
   value: false
 - group: Xamarin-Secrets