From c73fc52a147ad5c63c8fbe379803e6777ab04988 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Oct 2023 10:39:46 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/xharness build 20231019.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 8.0.0-prerelease.23516.1 -> To Version 8.0.0-prerelease.23519.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 66f882884cb7..e6c489316411 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "8.0.0-prerelease.23516.1", + "version": "8.0.0-prerelease.23519.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d0ce643c5d3..eb3cddeda214 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ https://github.com/dotnet/templating 3f4da9ced34942d83054e647f3b1d9d7dde281e8 - + https://github.com/dotnet/xharness - 02098f6cf81169134770ee47acc2aca0910635bb + de2e6a5e7ac1f33558ba06af1173122d93f0962e - + https://github.com/dotnet/xharness - 02098f6cf81169134770ee47acc2aca0910635bb + de2e6a5e7ac1f33558ba06af1173122d93f0962e - + https://github.com/dotnet/xharness - 02098f6cf81169134770ee47acc2aca0910635bb + de2e6a5e7ac1f33558ba06af1173122d93f0962e diff --git a/eng/Versions.props b/eng/Versions.props index ba3a746f2db8..a6d822d29094 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ <_HarfBuzzSharpVersion>7.3.0 <_SkiaSharpNativeAssetsVersion>0.0.0-commit.e2c5c86249621857107c779af0f79b4d06613766.655 7.0.100-preview.5.22226.1 - 8.0.0-prerelease.23516.1 - 8.0.0-prerelease.23516.1 - 8.0.0-prerelease.23516.1 + 8.0.0-prerelease.23519.1 + 8.0.0-prerelease.23519.1 + 8.0.0-prerelease.23519.1 0.9.0 0.5.13 1.2.0 From 3482270a436eeef1ceaefdec094fb18883f25d8d Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Fri, 20 Oct 2023 11:48:20 +0100 Subject: [PATCH 2/3] Fix version --- eng/pipelines/common/maui-templates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/maui-templates.yml b/eng/pipelines/common/maui-templates.yml index 3f45868eebed..5d1ebb938ed1 100644 --- a/eng/pipelines/common/maui-templates.yml +++ b/eng/pipelines/common/maui-templates.yml @@ -161,7 +161,7 @@ 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 "1.0.0-prerelease*" -g + - 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.23519.1" -g displayName: install xharness - pwsh: ./build.ps1 --target=dotnet-integration-build --verbosity=diagnostic From eb3b240c977504215cf810779ca1e701f4bc6385 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Sat, 21 Oct 2023 19:22:15 +0100 Subject: [PATCH 3/3] try run on Xcode15 --- eng/pipelines/common/maui-templates.yml | 1 + eng/pipelines/common/variables.yml | 4 ++-- eng/pipelines/device-tests.yml | 1 + eng/pipelines/ui-tests.yml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/maui-templates.yml b/eng/pipelines/common/maui-templates.yml index 5d1ebb938ed1..7bb402402463 100644 --- a/eng/pipelines/common/maui-templates.yml +++ b/eng/pipelines/common/maui-templates.yml @@ -75,6 +75,7 @@ jobs: demands: - macOS.Name -equals Ventura - macOS.Architecture -equals x64 + - Agent.OSVersion -equals 13.5 steps: - ${{ each step in parameters.prepareSteps }}: diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index e826de1d6557..04c639acb5aa 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -8,9 +8,9 @@ variables: - name: DOTNET_VERSION value: 7.0.401 - name: REQUIRED_XCODE - value: 14.3.1 + value: 15.0.0 - name: DEVICETESTS_REQUIRED_XCODE - value: 14.3.1 + value: 15.0.0 - name: LocBranchPrefix value: 'loc-hb' - name: isMainBranch diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml index b4d35e7e25f9..a1219ff1ebb0 100644 --- a/eng/pipelines/device-tests.yml +++ b/eng/pipelines/device-tests.yml @@ -74,6 +74,7 @@ parameters: demands: - macOS.Name -equals Ventura - macOS.Architecture -equals x64 + - Agent.OSVersion -equals 13.5 - name: catalystPool type: object diff --git a/eng/pipelines/ui-tests.yml b/eng/pipelines/ui-tests.yml index 24d136f97da6..e709533a887a 100644 --- a/eng/pipelines/ui-tests.yml +++ b/eng/pipelines/ui-tests.yml @@ -78,6 +78,7 @@ parameters: demands: - macOS.Name -equals Ventura - macOS.Architecture -equals x64 + - Agent.OSVersion -equals 13.5 - name: windowsPool type: object