Skip to content

Commit 54d9fa8

Browse files
[iOS][tvOS] Fix building runtime tests on iOS-like platforms (#91542)
* Do not trim XUnitWrapperGenerator * Avoid including ILLink * Publis trimmed only for exes * Fix duplicates check in merged test runner
1 parent 8256970 commit 54d9fa8

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/tests/Common/mergedrunner.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<_ProjectReferencesUsedByReferencePaths Include="@(ReferencePath->Metadata('ProjectReferenceOriginalItemSpec'))" />
10-
<_ProjectAssemblyReferences Include="@(ProjectReference)" Condition="'%(ProjectReference.OutputItemType)' == ''" />
10+
<_ProjectAssemblyReferences Include="@(ProjectReference)" Condition="'%(ProjectReference.OutputItemType)' == '' and '%(ProjectReference.ReferenceOutputAssembly)' != 'false'" />
1111
<_ProjectAssemblyReferences Remove="@(_ReferenceWithDisabledBuild->Metadata('OriginalItemSpec'))" />
1212
<_ProjectReferencesRemovedDueToConflictResolution Include="@(_ProjectAssemblyReferences)" Exclude="@(_ProjectReferencesUsedByReferencePaths)" />
1313
</ItemGroup>
@@ -17,6 +17,6 @@
1717
-->
1818
<Error Text="@(_ProjectReferencesRemovedDueToConflictResolution->'This project has an assembly name identical to another project, if this CoreCLRTestLibrary, you should reference %24(TestLibraryProjectPath) instead of constructing the path yourself: %(FullPath)', '&#010;')" Condition="'@(_ProjectReferencesRemovedDueToConflictResolution)' != ''" />
1919
</Target>
20-
20+
2121
<Import Project="$(RepoRoot)/src/tests/Common/mergedrunnermobile.targets" Condition="'$(TargetsMobile)' == 'true'" />
22-
</Project>
22+
</Project>

src/tests/Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,9 @@
205205
<ImportProjectExtensionTargets>false</ImportProjectExtensionTargets>
206206
</PropertyGroup>
207207

208-
<PropertyGroup Condition="'$(TargetOS)' == 'ios' Or '$(TargetOS)' == 'tvos'">
209-
<EnableAggressiveTrimming>true</EnableAggressiveTrimming>
210-
<PublishTrimmed>true</PublishTrimmed>
208+
<PropertyGroup Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvos'">
209+
<EnableAggressiveTrimming Condition="'$(OutputType)' == 'Exe'">true</EnableAggressiveTrimming>
210+
<PublishTrimmed Condition="'$(OutputType)' == 'Exe'">true</PublishTrimmed>
211211
<SkipTestUtilitiesReference>true</SkipTestUtilitiesReference>
212212
</PropertyGroup>
213213

src/tests/MergedTestRunner.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
<EmitCompilerGeneratedFiles Condition="'$(EmitCompilerGeneratedFiles)' == ''">true</EmitCompilerGeneratedFiles>
1313
</PropertyGroup>
1414

15+
1516
<ItemGroup>
1617
<!-- string.Concat("_", string.Copy("%(Filename)").Replace("-", "_").Replace(".", "_")) -->
1718
<MergedWrapperProjectReference Update="**" Aliases="$([System.String]::Concat(&quot;_&quot;,$([System.String]::Copy(&quot;%(Filename)&quot;).Replace(&quot;-&quot;,&quot;_&quot;).Replace(&quot;.&quot;,&quot;_&quot;))))" />
1819

1920
<ProjectReference Include="@(MergedWrapperProjectReference)" />
2021
</ItemGroup>
21-
</Project>
22+
</Project>

0 commit comments

Comments
 (0)