Skip to content

Commit

Permalink
[ci] Don't install xharness globally (#19863)
Browse files Browse the repository at this point in the history
* dont install xharness globally

* Fix restore
  • Loading branch information
rmarinho committed Jan 12, 2024
1 parent 7e2583c commit 65e950d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/maui-templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 65e950d

Please sign in to comment.