[monotouch-tests] Use a LinkDescription item to specify extra linker description files (#11948)
* It's easier to fix up the path to the linker description in xharness when
cloning project files. This way maybe we'll be able to remove the [hardcoded
logic in xharness][1] to handle ${ProjectDir}.
* .NET doesn't understand the ${ProjectDir} syntax, so this makes it possible
to build these projects from the command line.
[1]: b2297d610d/src/Microsoft.DotNet.XHarness.iOS.Shared/Utilities/ProjectFileExtensions.cs (L1268)
This commit is contained in:
Родитель
aed792397c
Коммит
9278ee1610
|
@ -17,7 +17,6 @@
|
|||
<DefineConstants Condition="'$(Platform)' != 'iPhoneSimulator'">$(DefineConstants);DEVICE</DefineConstants>
|
||||
<RootTestsDirectory>..\..\..</RootTestsDirectory>
|
||||
<MtouchLink>None</MtouchLink>
|
||||
<MtouchExtraArgs>-xml=${ProjectDir}/../extra-linker-defs.xml</MtouchExtraArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -33,6 +32,8 @@
|
|||
<None Include="..\..\Entitlements.plist" />
|
||||
<None Include="..\..\app.config" />
|
||||
<None Include="..\..\EmptyNib.xib" />
|
||||
|
||||
<LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
<DefineConstants Condition="'$(Platform)' != 'iPhoneSimulator'">$(DefineConstants);DEVICE</DefineConstants>
|
||||
<RootTestsDirectory>..\..\..</RootTestsDirectory>
|
||||
<MtouchLink>None</MtouchLink>
|
||||
<MtouchExtraArgs>-xml=${ProjectDir}/../extra-linker-defs.xml</MtouchExtraArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -28,11 +27,17 @@
|
|||
<PackageReference Include="System.Json" Version="4.7.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="Info.plist" />
|
||||
<None Include="..\..\Entitlements.plist" />
|
||||
<None Include="..\..\app.config" />
|
||||
<None Include="..\..\EmptyNib.xib" />
|
||||
|
||||
<LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
<DefineConstants Condition="'$(Platform)' != 'iPhoneSimulator'">$(DefineConstants);DEVICE</DefineConstants>
|
||||
<RootTestsDirectory>..\..\..</RootTestsDirectory>
|
||||
<MtouchLink>None</MtouchLink>
|
||||
<MtouchExtraArgs>-xml=${ProjectDir}/../extra-linker-defs.xml</MtouchExtraArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -33,6 +32,8 @@
|
|||
<None Include="..\..\Entitlements.plist" />
|
||||
<None Include="..\..\app.config" />
|
||||
<None Include="..\..\EmptyNib.xib" />
|
||||
|
||||
<LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
Загрузка…
Ссылка в новой задаче