Skip to content

Override ResolveReadyToRunCompilers for TestReadyToRun=true test builds #123734

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
jkoritzinsky merged 7 commits into from
Feb 4, 2026
+27 −23
Merged

Override ResolveReadyToRunCompilers for TestReadyToRun=true test builds #123734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b19281
Override ResolveReadyToRunCompilers for TestReadyToRun=true test builds
jkoritzinsky Jan 28, 2026
23a0829
Baseline failures from disabling BinaryFormatter
jkoritzinsky Jan 29, 2026
e91992b
Handle referencing "newer" oobs in the single-file r2r test harness s…
jkoritzinsky Jan 30, 2026
3ae468a
Try 2 on fixing handling oobs
jkoritzinsky Jan 30, 2026
047fae1
Apply suggestion from @jkoritzinsky
jkoritzinsky Jan 31, 2026
dc1f8b6
Try to filter the set of assets that we consider "already R2Rd" bette…
jkoritzinsky Feb 2, 2026
c55cfbf
Disable tests that failed so we can finally get this green again
jkoritzinsky Feb 3, 2026
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
17 changes: 17 additions & 0 deletions eng/testing/tests.readytorun.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project>
<!-- Override the path to the in-tree crossgen2. -->
<Target Name="ResolveReadyToRunCompilers">
<PropertyGroup>
<Crossgen2Path>$([MSBuild]::NormalizePath('$(Crossgen2InBuildDir)', 'crossgen2$(ExeSuffix)'))</Crossgen2Path>
<_CrossGenTargetOS Condition="'$(TargetsAndroid)' != 'true'">$(TargetOS)</_CrossGenTargetOS>
<_CrossGenTargetOS Condition="'$(TargetsAndroid)' == 'true'">linux</_CrossGenTargetOS>
</PropertyGroup>

<ItemGroup>
<Crossgen2Tool Include="$(Crossgen2Path)"
TargetArch="$(TargetArchitecture)"
TargetOS="$(_CrossGenTargetOS)"
PerfmapFormatVersion="$(PublishReadyToRunPerfmapFormatVersion)"/>
</ItemGroup>
</Target>
</Project>
31 changes: 8 additions & 23 deletions eng/testing/tests.singlefile.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<PropertyGroup Condition="'$(TestReadyToRun)' == 'true'">
<PublishReadyToRun>true</PublishReadyToRun>
<PublishSingleFile>false</PublishSingleFile>
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)tests.readytorun.targets</AfterMicrosoftNETSdkTargets>
</PropertyGroup>

<PropertyGroup Condition="'$(TestNativeAot)' == 'true'">
Expand Down Expand Up @@ -92,7 +93,13 @@

<ItemGroup>
<_BundleAssembliesToCopy Include="$(ArtifactsNetCoreAppBundlePath)*.dll" />
<ResolvedFileToPublish Remove="@(_BundleAssembliesToCopy)" MatchOnMetadata="Filename" />
<!-- Only remove files from the shared framework that match existing R2R binaries. Otherwise we can remove an OOB that goes forward of the framework's assembly. -->
<ResolvedFileToPublish Remove="@(_BundleAssembliesToCopy->'$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)%(Filename)%(Extension)')" />
<!--
If there's any OOB assemblies that we're still referencing, make sure that we don't overwrite them with the assemblies from the bundle.
Filter for CopyLocal=true assets to ensure we're not grabbing "Content" or "None" items here.
-->
<_BundleAssembliesToCopy Remove="@(ResolvedFileToPublish->WithMetadataValue('CopyLocal','true'))" MatchOnMetadata="Filename;Extension" />
</ItemGroup>
</Target>

Expand Down Expand Up @@ -160,28 +167,6 @@

</Target>

<!--
There are a few tests that need a 'live-ref-pack', which is missing from the
publish directory in TestReadyToRun builds. This target copies it there.
-->
<Target Name="CopyLiveRefPackIfPresent"
Condition="'$(TestReadyToRun)' == 'true'"
AfterTargets="CopyExistingR2RBinaries">

<ItemGroup>
<OutDirLiveRefPackFiles Include="$(OutDir)live-ref-pack/*" />
</ItemGroup>

<Copy SourceFiles="@(OutDirLiveRefPackFiles)"
DestinationFolder="$(PublishDir)live-ref-pack"
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
Retries="$(CopyRetryCount)"
RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
UseHardlinksIfPossible="$(CreateHardLinksForPublishFilesIfPossible)"
UseSymboliclinksIfPossible="$(CreateSymbolicLinksForPublishFilesIfPossible)" />

</Target>

<Target Name="__UpdateExcludedAssembliesFromSingleFile"
Inputs="ExcludeFromSingleFile"
Outputs="ResolvedFileToPublish"
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,6 +1581,7 @@ private static void ExecuteAndUnload(string assemblyfile, Action<Assembly> assem
// loaded in the default ALC, which causes problems for this test.
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsAssemblyLoadingSupported), nameof(PlatformDetection.IsNotMobile))]
[ActiveIssue("34072", TestRuntimes.Mono)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/95928", typeof(PlatformDetection), nameof(PlatformDetection.IsReadyToRunCompiled))]
public static void TypeDescriptor_WithDefaultProvider_UnloadsUnloadableTypes()
{
ExecuteAndUnload("UnloadableTestTypes.dll",
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2568,6 +2568,7 @@ public static void Xml_TypeWithSpecialCharacterInStringMember()
[SkipOnPlatform(TestPlatforms.Browser, "AssemblyDependencyResolver not supported in wasm")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/34072", TestRuntimes.Mono)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/95928", typeof(PlatformDetection), nameof(PlatformDetection.IsReadyToRunCompiled))]
public static void Xml_TypeInCollectibleALC()
{
ExecuteAndUnload("SerializableAssembly.dll", "SerializationTypes.SimpleType", out var weakRef);
Expand Down
Loading