Skip to content

Commit 572d4aa

Browse files
committed
Remove unused code
1 parent a08edf3 commit 572d4aa

File tree

3 files changed

+3
-26
lines changed

3 files changed

+3
-26
lines changed

eng/testing/tests.ioslike.targets

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@
7777
<BundleFiles Include="$(MonoProjectRoot)\msbuild\apple\data\*" TargetDir="publish" />
7878
<ExtraFiles Condition="'%(AppleAssembliesToBundle._IsNative)' == 'true'"
7979
Include="@(AppleAssembliesToBundle)" TargetDir="extraFiles\%(AppleAssembliesToBundle.RecursiveDir)" />
80-
<ExtraFiles Condition="Exists(%(TrimmerRootDescriptor.Identity))"
81-
Include="@(TrimmerRootDescriptor)" TargetDir="extraFiles" />
8280
</ItemGroup>
8381

8482
<ItemGroup Condition="'$(UseNativeAOTRuntime)' == 'true' and '$(HybridGlobalization)' == 'false'" >
@@ -156,12 +154,6 @@
156154
<_AppleItemsToPass Include="@(ReferenceExtraPathFiles->'%(FileName)%(Extension)')"
157155
OriginalItemName__="AppleReferenceExtraPathFiles" />
158156

159-
<_AppleItemsToPass Include="@(RuntimeHostConfigurationOption)"
160-
OriginalItemName__="_AppleUsedRuntimeHostConfigurationOption" />
161-
162-
<_AppleItemsToPass Include="@(TrimmerRootAssembly)"
163-
OriginalItemName__="TrimmerRootAssembly" />
164-
165157
<!-- Example of passing items to the project
166158
167159
<_AppleItemsToPass Include="@(BundleFiles)" OriginalItemName__="BundleFiles" ConditionToUse__="'$(Foo)' != 'true'" />

src/libraries/tests.proj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,10 @@
339339
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj" />
340340
<!-- Reference deleted by _CopyTestArchive https://github.com/dotnet/runtime/issues/80976 -->
341341
<ProjectExclusions Include="$(RepoRoot)/src/tests/FunctionalTests/iOS/Simulator/StartupHook/iOS.Simulator.StartupHook.Test.csproj" />
342-
<!-- TODO: Add tracking issue -->
342+
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/101692 -->
343343
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Formats.Tar/tests/System.Formats.Tar.Tests.csproj" />
344+
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/109282 -->
345+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime/tests/System.IO.UnmanagedMemoryStream.Tests.csproj" />
344346

345347
<!-- Source generators tests. Not testing customer scenarios. Low priority -->
346348
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Logging.Abstractions\tests\Microsoft.Extensions.Logging.Generators.Tests\Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests.csproj" />

src/mono/msbuild/apple/data/ProxyProjectForAOTOnHelix.proj

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<ExtraFilesPath>$([MSBuild]::NormalizeDirectory($(TestRootDir), '..', 'extraFiles'))</ExtraFilesPath>
88
<BaseIntermediateOutputPath>$([MSBuild]::NormalizeDirectory($(TestRootDir), '..', 'obj'))</BaseIntermediateOutputPath>
99

10-
<AppleBuildDependsOn Condition="'$(EnableAggressiveTrimming)' == 'true' and '$(UseNativeAOTRuntime)' != 'true'">ConfigureTrimming;_AdjustTrimmedAssembliesToBundle;$(AppleBuildDependsOn)</AppleBuildDependsOn>
1110
<AppleBuildDependsOn>_PublishRuntimePack;_PrepareForAppleBuildAppOnHelix;$(AppleBuildDependsOn);_AfterAppleBuildOnHelix</AppleBuildDependsOn>
1211
<!-- Forced by ILLink targets -->
1312
<SelfContained>true</SelfContained>
@@ -95,14 +94,6 @@
9594
<RuntimeComponents Include="diagnostics_tracing" />
9695
<RuntimeComponents Include="marshal-ilgen" />
9796
</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>
10697
</Target>
10798

10899
<Target Name="_PublishRuntimePack"
@@ -117,14 +108,6 @@
117108
DestinationFolder="$(OriginalPublishDir)" />
118109
</Target>
119110

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-
128111
<!-- Move the app to where the xharness runner expects it. -->
129112
<Target Name="_AfterAppleBuildOnHelix">
130113
<PropertyGroup>

0 commit comments

Comments
 (0)