|
7 | 7 | <ExtraFilesPath>$([MSBuild]::NormalizeDirectory($(TestRootDir), '..', 'extraFiles'))</ExtraFilesPath>
|
8 | 8 | <BaseIntermediateOutputPath>$([MSBuild]::NormalizeDirectory($(TestRootDir), '..', 'obj'))</BaseIntermediateOutputPath>
|
9 | 9 |
|
10 |
| - <AppleBuildDependsOn Condition="'$(EnableAggressiveTrimming)' == 'true' and '$(UseNativeAOTRuntime)' != 'true'">ConfigureTrimming;_AdjustTrimmedAssembliesToBundle;$(AppleBuildDependsOn)</AppleBuildDependsOn> |
11 | 10 | <AppleBuildDependsOn>_PublishRuntimePack;_PrepareForAppleBuildAppOnHelix;$(AppleBuildDependsOn);_AfterAppleBuildOnHelix</AppleBuildDependsOn>
|
12 | 11 | <!-- Forced by ILLink targets -->
|
13 | 12 | <SelfContained>true</SelfContained>
|
|
95 | 94 | <RuntimeComponents Include="diagnostics_tracing" />
|
96 | 95 | <RuntimeComponents Include="marshal-ilgen" />
|
97 | 96 | </ItemGroup>
|
98 |
| - |
99 |
| - <ItemGroup Condition="'$(EnableAggressiveTrimming)' == 'true' and '$(UseNativeAOTRuntime)' != 'true'"> |
100 |
| - <TrimmerRootDescriptor Include="$(ExtraFilesPath)**\*.xml" /> |
101 |
| - |
102 |
| - <!-- To recreate the state of feature flags (RuntimeHostConfigurationOption) during app build-time we need to discard the default setting, coming from SDK, and used the values passed in ProxyProjectForAOTOnHelix.props --> |
103 |
| - <RuntimeHostConfigurationOption Remove="@(_AppleUsedRuntimeHostConfigurationOption)" /> |
104 |
| - <RuntimeHostConfigurationOption Include="@(_AppleUsedRuntimeHostConfigurationOption)" /> |
105 |
| - </ItemGroup> |
106 | 97 | </Target>
|
107 | 98 |
|
108 | 99 | <Target Name="_PublishRuntimePack"
|
|
117 | 108 | DestinationFolder="$(OriginalPublishDir)" />
|
118 | 109 | </Target>
|
119 | 110 |
|
120 |
| - <!-- Since we are reusing the 'publish' folder for different purposes (e.g., using it as a source and destination directory for trimming) we need to adjust the list of assemblies to bundle once trimming is completed. --> |
121 |
| - <Target Name="_AdjustTrimmedAssembliesToBundle" DependsOnTargets="ILLink;CopyFilesToPublishDirectory"> |
122 |
| - <ItemGroup> |
123 |
| - <AppleAssembliesToBundle Remove="@(AppleAssembliesToBundle)" /> |
124 |
| - <AppleAssembliesToBundle Include="$(OriginalPublishDir)**\*.dll" Exclude="$(OriginalPublishDir)\**\*.resources.dll;@(_RemovedManagedAssembly)" /> |
125 |
| - </ItemGroup> |
126 |
| - </Target> |
127 |
| - |
128 | 111 | <!-- Move the app to where the xharness runner expects it. -->
|
129 | 112 | <Target Name="_AfterAppleBuildOnHelix">
|
130 | 113 | <PropertyGroup>
|
|
0 commit comments