未验证 提交 fb313bba 编写于 作者: S Steve Pfister 提交者: GitHub

[iOS] Fix iOS nativeaot runtime test build (#90327)

In https://github.com/dotnet/runtime/pull/89869, the call to the AppleAppBuilderTask passed an item for `NativeDependencies` as opposed to a property. The change wasn't reflected in the runtime test build.proj, so the built test app wasn't being sent in.

Fixes https://github.com/dotnet/runtime/issues/90312

Fixes https://github.com/dotnet/runtime/issues/90218
上级 04553bf3
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<_HostOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx</_HostOS> <_HostOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx</_HostOS>
<_HostOS Condition="'$(_HostOS)' == ''">linux</_HostOS> <_HostOS Condition="'$(_HostOS)' == ''">linux</_HostOS>
<_IsLibraryMode Condition="'$(NativeLib)' != ''">true</_IsLibraryMode> <_IsLibraryMode Condition="'$(UseNativeAOTRuntime)' != 'true' and '$(NativeLib)' != ''">true</_IsLibraryMode>
<AndroidBuildAfterThisTarget Condition="'$(AndroidBuildAfterThisTarget)' == ''">Publish</AndroidBuildAfterThisTarget> <AndroidBuildAfterThisTarget Condition="'$(AndroidBuildAfterThisTarget)' == ''">Publish</AndroidBuildAfterThisTarget>
<AndroidBuildDependsOn> <AndroidBuildDependsOn>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/87740 --> <!-- Tracking issue: https://github.com/dotnet/runtime/issues/87740 -->
<!-- <ShouldILStrip Condition="'$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' != 'true'">true</ShouldILStrip> --> <!-- <ShouldILStrip Condition="'$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' != 'true'">true</ShouldILStrip> -->
<_IsLibraryMode Condition="'$(NativeLib)' != ''">true</_IsLibraryMode> <_IsLibraryMode Condition="'$(UseNativeAOTRuntime)' != 'true' and '$(NativeLib)' != ''">true</_IsLibraryMode>
<AppleBuildAfterThisTarget Condition="'$(AppleBuildAfterThisTarget)' == ''">Publish</AppleBuildAfterThisTarget> <AppleBuildAfterThisTarget Condition="'$(AppleBuildAfterThisTarget)' == ''">Publish</AppleBuildAfterThisTarget>
<AppleBuildDependsOn> <AppleBuildDependsOn>
......
...@@ -414,7 +414,6 @@ ...@@ -414,7 +414,6 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NativeDependencies>$(IntermediateOutputPath)\..\$(TestRelativePath)\$(TestName)\native\$(TestName).o</NativeDependencies>
<DevTeamProvisioning>-</DevTeamProvisioning> <DevTeamProvisioning>-</DevTeamProvisioning>
<AppleGenerateAppBundle>true</AppleGenerateAppBundle> <AppleGenerateAppBundle>true</AppleGenerateAppBundle>
<GenerateXcodeProject>true</GenerateXcodeProject> <GenerateXcodeProject>true</GenerateXcodeProject>
...@@ -423,6 +422,10 @@ ...@@ -423,6 +422,10 @@
<MonoForceInterpreter>false</MonoForceInterpreter> <MonoForceInterpreter>false</MonoForceInterpreter>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<NativeDependencies Include="$(IntermediateOutputPath)\..\$(TestRelativePath)\$(TestName)\native\$(TestName).o" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<_LinkerFlagsToDrop Include="@(NativeFramework->'-framework %(Identity)')" /> <_LinkerFlagsToDrop Include="@(NativeFramework->'-framework %(Identity)')" />
<LinkerArg Remove="@(_LinkerFlagsToDrop)" /> <LinkerArg Remove="@(_LinkerFlagsToDrop)" />
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册