Skip to content

[main] Update dependencies from dotnet/xharness #122072

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

Merged
kotlarmilos merged 12 commits into from
Dec 4, 2025
Merged

[main] Update dependencies from dotnet/xharness #122072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
64083c7
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Dec 1, 2025
3509682
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Dec 1, 2025
1267ce3
Test scouting queues
kotlarmilos Dec 2, 2025
968f616
Merge branch 'main' into darc-main-b5ce5e4d-22c1-4490-90ec-4cd273e75938
kotlarmilos Dec 2, 2025
c29cef0
Enable mono tests
kotlarmilos Dec 2, 2025
757e50e
Merge branch 'darc-main-b5ce5e4d-22c1-4490-90ec-4cd273e75938' of gith…
kotlarmilos Dec 2, 2025
fc228d4
Test helix queue and linker flag
kotlarmilos Dec 3, 2025
fd19d0c
Test scouting queues
kotlarmilos Dec 3, 2025
e6373d1
Disable linker optimization for macOS 14+
kotlarmilos Dec 3, 2025
37ea56c
Revert changes
kotlarmilos Dec 3, 2025
a549731
Add UseMonoRuntime condition for the linker flag
kotlarmilos Dec 3, 2025
cbdf705
Update linker arguments
kotlarmilos Dec 3, 2025
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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "11.0.0-prerelease.25578.2",
"version": "11.0.0-prerelease.25601.7",
"commands": [
"xharness"
]
Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ This file should be imported by eng/Versions.props
<SystemTextJsonPackageVersion>10.0.0-rc.1.25528.108</SystemTextJsonPackageVersion>
<!-- dotnet/runtime-assets dependencies -->
<MicrosoftDotNetCilStripSourcesPackageVersion>11.0.0-beta.25553.1</MicrosoftDotNetCilStripSourcesPackageVersion>
<MicrosoftDotnetFuzzingTestDataPackageVersion>11.0.0-beta.25574.4</MicrosoftDotnetFuzzingTestDataPackageVersion>
<MicrosoftDotnetFuzzingTestDataPackageVersion>11.0.0-beta.25553.1</MicrosoftDotnetFuzzingTestDataPackageVersion>
<MicrosoftNETHostModelTestDataPackageVersion>11.0.0-beta.25553.1</MicrosoftNETHostModelTestDataPackageVersion>
<SystemComponentModelTypeConverterTestDataPackageVersion>11.0.0-beta.25553.1</SystemComponentModelTypeConverterTestDataPackageVersion>
<SystemDataCommonTestDataPackageVersion>11.0.0-beta.25553.1</SystemDataCommonTestDataPackageVersion>
Expand All @@ -97,9 +97,9 @@ This file should be imported by eng/Versions.props
<SystemTextRegularExpressionsTestDataPackageVersion>11.0.0-beta.25553.1</SystemTextRegularExpressionsTestDataPackageVersion>
<SystemWindowsExtensionsTestDataPackageVersion>11.0.0-beta.25553.1</SystemWindowsExtensionsTestDataPackageVersion>
<!-- dotnet/xharness dependencies -->
<MicrosoftDotNetXHarnessCLIPackageVersion>11.0.0-prerelease.25578.2</MicrosoftDotNetXHarnessCLIPackageVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>11.0.0-prerelease.25578.2</MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>11.0.0-prerelease.25578.2</MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>
<MicrosoftDotNetXHarnessCLIPackageVersion>11.0.0-prerelease.25601.7</MicrosoftDotNetXHarnessCLIPackageVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>11.0.0-prerelease.25601.7</MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>11.0.0-prerelease.25601.7</MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>
<!-- _git/dotnet-optimization dependencies -->
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxx64MIBCRuntimePackageVersion>
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,17 +291,17 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e545239117919cda700be149a2e9a032374fc284</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="11.0.0-prerelease.25578.2">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="11.0.0-prerelease.25601.7">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e26a7b2ad453b6739b033b18d9f896ab2f112e36</Sha>
<Sha>8c52965b101b84e92f3e088666684be4857e9429</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="11.0.0-prerelease.25578.2">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="11.0.0-prerelease.25601.7">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e26a7b2ad453b6739b033b18d9f896ab2f112e36</Sha>
<Sha>8c52965b101b84e92f3e088666684be4857e9429</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="11.0.0-prerelease.25578.2">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="11.0.0-prerelease.25601.7">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e26a7b2ad453b6739b033b18d9f896ab2f112e36</Sha>
<Sha>8c52965b101b84e92f3e088666684be4857e9429</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="11.0.0-beta.25528.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:

# tvOS devices
- ${{ if in(parameters.platform, 'tvos_arm64') }}:
- OSX.13.Amd64.AppleTV.Open
- OSX.13.Amd64.AppleTV.Open

# Linux arm
- ${{ if eq(parameters.platform, 'linux_arm') }}:
Expand Down
4 changes: 4 additions & 0 deletions src/mono/msbuild/apple/build/AppleBuild.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@

<ItemGroup>
<ExtraAppLinkerArgs Include="@(_CommonLinkerArgs)" />
<!-- Disable linker optimization to prevent AOT PLT resolution failures on macOS 14+. This is only visible in CI and isn't reproducible locally.
Tracking issue: https://github.com/dotnet/runtime/issues/117159 -->
<ExtraAppLinkerArgs Condition="'$(UseMonoRuntime)' == 'true' and '$(UseNativeAOTRuntime)' != 'true'" Include="-Xlinker" />
<ExtraAppLinkerArgs Condition="'$(UseMonoRuntime)' == 'true' and '$(UseNativeAOTRuntime)' != 'true'" Include="-O0" />
</ItemGroup>

<ItemGroup Condition="'$(_IsLibraryMode)' == 'true' and '$(UseNativeAOTRuntime)' != 'true'">
Expand Down
Loading