Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/8.0] Stop testing on windows.10.amd64.android.open #15063

Merged
merged 3 commits into from
Sep 11, 2024
Merged

[release/8.0] Stop testing on windows.10.amd64.android.open #15063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0c0465
[release/8.0] Stop testing on windows.10.amd64.android.open
dougbu Sep 9, 2024
8dc3f34
Move to a newer XHarness CLI
dougbu Sep 10, 2024
123bb05
Try disabling the apk verification
premun Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>25745248c19ebbca84d70591a0adb5fba8957085</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23477.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24452.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2b1d423ce08e1ed78c0a821d0850e0f5ab3b193a</Sha>
<Sha>c2c79961da93101b0ab76c95e3b817165d36e9fe</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.2-3.23266.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<!-- vstest -->
<MicrosoftNetTestSdkVersion>17.5.0</MicrosoftNetTestSdkVersion>
<!-- xharness -->
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23477.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24452.3</MicrosoftDotNetXHarnessCLIVersion>
<!-- xliff-tasks -->
<MicrosoftDotNetXliffTasksVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksVersion>
<!-- external -->
Expand Down
3 changes: 3 additions & 0 deletions src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-runner.android.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ function xharness() {
dotnet exec $Env:XHARNESS_CLI_PATH @args
}

dotnet exec $Env:XHARNESS_CLI_PATH android adb -- shell settings put global verifier_verify_adb_installs 0
dotnet exec $Env:XHARNESS_CLI_PATH android adb -- shell settings put global package_verifier_enable 0

# User can call this when they detect a problem they think is caused by the infrastructure
function report_infrastructure_failure($message) {
Write-Output "Infrastructural problem reported by the user, requesting retry+reboot: $message"
Expand Down
2 changes: 1 addition & 1 deletion tests/XHarness.Android.DeviceTests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<XHarnessAndroidProject Include="$(MSBuildThisFileDirectory)XHarness/XHarness.TestApks.proj">
<AdditionalProperties>XHarnessTestARM64_V8A=true</AdditionalProperties>
</XHarnessAndroidProject>
<HelixTargetQueue Include="windows.10.amd64.android.open" />
<HelixTargetQueue Include="windows.11.amd64.android.open" />
</ItemGroup>

<Target Name="Pack"/>
Expand Down
Loading