From 05394d688abfba759e69178af60c762aeeaaebf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Aug 2025 05:02:06 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/xharness build 20250812.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 10.0.0-prerelease.25405.1 -> To Version 10.0.0-prerelease.25412.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.props | 6 +++--- eng/Version.Details.xml | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 89a0e5a4637dba..dc7c9a6cf4bd11 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "10.0.0-prerelease.25405.1", + "version": "10.0.0-prerelease.25412.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f835914c56a741..079e96308665bf 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -97,9 +97,9 @@ This file should be imported by eng/Versions.props 10.0.0-beta.25310.1 10.0.0-beta.25310.1 - 10.0.0-prerelease.25405.1 - 10.0.0-prerelease.25405.1 - 10.0.0-prerelease.25405.1 + 10.0.0-prerelease.25412.1 + 10.0.0-prerelease.25412.1 + 10.0.0-prerelease.25412.1 1.0.0-prerelease.25413.5 1.0.0-prerelease.25413.5 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ac18f0b9cd027..52d95d5dc8a22b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -291,17 +291,17 @@ https://github.com/dotnet/dotnet 5088919af0e4a144ce5b294542f472bf668c9cc8 - + https://github.com/dotnet/xharness - 4c17e23fcb7575baa9de575e5a96258096cbaea1 + fe850ca677efa9ed62009b929f55ff59d5e24c0e - + https://github.com/dotnet/xharness - 4c17e23fcb7575baa9de575e5a96258096cbaea1 + fe850ca677efa9ed62009b929f55ff59d5e24c0e - + https://github.com/dotnet/xharness - 4c17e23fcb7575baa9de575e5a96258096cbaea1 + fe850ca677efa9ed62009b929f55ff59d5e24c0e https://github.com/dotnet/dotnet From 89f9b94a48960f3582a740c74e62576cbe31fd03 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Mon, 18 Aug 2025 13:26:42 +0200 Subject: [PATCH 2/4] Test scouting queues --- eng/pipelines/libraries/helix-queues-setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 71713d3bccb3c7..4d03b87bea9019 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -100,11 +100,11 @@ jobs: # iOS devices - ${{ if in(parameters.platform, 'ios_arm64') }}: - - OSX.13.Amd64.Iphone.Open + - osx.amd64.iphone.scouting.open # tvOS devices - ${{ if in(parameters.platform, 'tvos_arm64') }}: - - OSX.13.Amd64.AppleTV.Open + - osx.amd64.appletv.scouting.open # windows x64 - ${{ if eq(parameters.platform, 'windows_x64') }}: From 62252a38f5aab3786cf9d4a9ced0686579b4cda2 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 19 Aug 2025 16:40:03 +0200 Subject: [PATCH 3/4] Test --signal-app-end --- eng/testing/AppleRunnerTemplate.sh | 1 - eng/testing/tests.ioslike.targets | 1 - 2 files changed, 2 deletions(-) diff --git a/eng/testing/AppleRunnerTemplate.sh b/eng/testing/AppleRunnerTemplate.sh index e3f82159daf792..0df14a3c63ac76 100644 --- a/eng/testing/AppleRunnerTemplate.sh +++ b/eng/testing/AppleRunnerTemplate.sh @@ -38,7 +38,6 @@ if [[ "$TARGET" == "ios-device" ]]; then SCHEME_SDK=$CONFIGURATION-iphoneos; fi if [[ "$TARGET" == "tvos-device" ]]; then SCHEME_SDK=$CONFIGURATION-appletvos; fi if [[ "$TARGET" == "maccatalyst" ]]; then SCHEME_SDK=$CONFIGURATION-maccatalyst; fi -if [[ "$TARGET" == "ios-device" || "$TARGET" == "tvos-device" ]]; then SIGNAL_APP_END="--signal-app-end"; fi cd $EXECUTION_DIR diff --git a/eng/testing/tests.ioslike.targets b/eng/testing/tests.ioslike.targets index 6e7d667bdfe020..32b269f075dc56 100644 --- a/eng/testing/tests.ioslike.targets +++ b/eng/testing/tests.ioslike.targets @@ -21,7 +21,6 @@ <_AOTBuildCommand>$(_AOTBuildCommand) <_ResetSimulatorSwitch Condition="('$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvossimulator') and '$(IncludesTestRunner)' == 'true'">--reset-simulator - <_SignalAppEndSwitch>--signal-app-end <_AppleSignCommand Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvos'">sign "$app" true From f96640dc9aa647f45943a2d5ee16a7c247b826a1 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Mon, 25 Aug 2025 17:07:35 +0200 Subject: [PATCH 4/4] Revert changes --- eng/pipelines/libraries/helix-queues-setup.yml | 4 ++-- eng/testing/AppleRunnerTemplate.sh | 1 + eng/testing/tests.ioslike.targets | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 4d03b87bea9019..71713d3bccb3c7 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -100,11 +100,11 @@ jobs: # iOS devices - ${{ if in(parameters.platform, 'ios_arm64') }}: - - osx.amd64.iphone.scouting.open + - OSX.13.Amd64.Iphone.Open # tvOS devices - ${{ if in(parameters.platform, 'tvos_arm64') }}: - - osx.amd64.appletv.scouting.open + - OSX.13.Amd64.AppleTV.Open # windows x64 - ${{ if eq(parameters.platform, 'windows_x64') }}: diff --git a/eng/testing/AppleRunnerTemplate.sh b/eng/testing/AppleRunnerTemplate.sh index 0df14a3c63ac76..e3f82159daf792 100644 --- a/eng/testing/AppleRunnerTemplate.sh +++ b/eng/testing/AppleRunnerTemplate.sh @@ -38,6 +38,7 @@ if [[ "$TARGET" == "ios-device" ]]; then SCHEME_SDK=$CONFIGURATION-iphoneos; fi if [[ "$TARGET" == "tvos-device" ]]; then SCHEME_SDK=$CONFIGURATION-appletvos; fi if [[ "$TARGET" == "maccatalyst" ]]; then SCHEME_SDK=$CONFIGURATION-maccatalyst; fi +if [[ "$TARGET" == "ios-device" || "$TARGET" == "tvos-device" ]]; then SIGNAL_APP_END="--signal-app-end"; fi cd $EXECUTION_DIR diff --git a/eng/testing/tests.ioslike.targets b/eng/testing/tests.ioslike.targets index 32b269f075dc56..6e7d667bdfe020 100644 --- a/eng/testing/tests.ioslike.targets +++ b/eng/testing/tests.ioslike.targets @@ -21,6 +21,7 @@ <_AOTBuildCommand>$(_AOTBuildCommand) <_ResetSimulatorSwitch Condition="('$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvossimulator') and '$(IncludesTestRunner)' == 'true'">--reset-simulator + <_SignalAppEndSwitch>--signal-app-end <_AppleSignCommand Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvos'">sign "$app" true