diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index c2e2a9e7fb253a..89a0e5a4637dba 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "10.0.0-prerelease.25330.2", + "version": "10.0.0-prerelease.25405.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 24a854e1ad8989..77d7bf30e2a69f 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.25330.2 - 10.0.0-prerelease.25330.2 - 10.0.0-prerelease.25330.2 + 10.0.0-prerelease.25405.1 + 10.0.0-prerelease.25405.1 + 10.0.0-prerelease.25405.1 1.0.0-prerelease.25363.1 1.0.0-prerelease.25363.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0be0731b741ec2..e288750ddb4743 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -291,17 +291,17 @@ https://github.com/dotnet/dotnet 30bc8f92be07c2c8c3a6addb946877260e042f63 - + https://github.com/dotnet/xharness - feac80219b22c403d32df9b6bd61cbf78e1b9986 + 4c17e23fcb7575baa9de575e5a96258096cbaea1 - + https://github.com/dotnet/xharness - feac80219b22c403d32df9b6bd61cbf78e1b9986 + 4c17e23fcb7575baa9de575e5a96258096cbaea1 - + https://github.com/dotnet/xharness - feac80219b22c403d32df9b6bd61cbf78e1b9986 + 4c17e23fcb7575baa9de575e5a96258096cbaea1 https://github.com/dotnet/dotnet diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index fdebac85bc327a..71713d3bccb3c7 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -37,7 +37,7 @@ jobs: # Linux musl x64 - ${{ if eq(parameters.platform, 'linux_musl_x64') }}: - - ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: + - ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Alpine.edge.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-edge-helix-amd64 - ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Alpine.322.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64 @@ -75,7 +75,7 @@ jobs: - Ubuntu.2204.Amd64.Open - (AzureLinux.3.0.Amd64.Open)AzureLinux.3.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64 - (Centos.10.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-helix-amd64 - + # OSX arm64 - ${{ if eq(parameters.platform, 'osx_arm64') }}: - osx.13.arm64.open diff --git a/src/libraries/sendtohelix-mobile.targets b/src/libraries/sendtohelix-mobile.targets index 1475f03ad4df4a..3d128ce22a3aa0 100644 --- a/src/libraries/sendtohelix-mobile.targets +++ b/src/libraries/sendtohelix-mobile.targets @@ -90,7 +90,6 @@ Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveTestsRoot)', '*.app', System.IO.SearchOption.AllDirectories))"> $(AppleTestTarget) $(_workItemTimeout) - $(_workItemTimeout) $(_XHarnessAppleCustomCommand) @@ -100,7 +99,6 @@ Exclude="$([System.IO.Directory]::GetFiles('$(TestArchiveRoot)', 'xharness-app-payload*', System.IO.SearchOption.AllDirectories))"> $(AppleTestTarget) $(_workItemTimeout) - $(_workItemTimeout) $(_XHarnessAppleCustomCommand) diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj index b9daf4afbbe59e..28fc40a768f954 100644 --- a/src/tests/Common/helixpublishwitharcade.proj +++ b/src/tests/Common/helixpublishwitharcade.proj @@ -1010,7 +1010,6 @@ $(AppleTestTarget) $([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes))) - $([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes))) $(SigningCommand) dotnet $(XUnitRunnerDll) %(XUnitWrapperDlls) $(XUnitRunnerArgs) @@ -1018,7 +1017,6 @@ --set-env=TestExclusionListPath=TestExclusionList.txt $(AppleTestTarget) $([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes))) - $([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes)))