mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.2.0.175

Browse Source 
Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
external/corert/tests/src/Simple/SimpleTest.targets vendored
View File

@@ -2,9 +2,9 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<OutputPath>$(MSBuildProjectDirectory)\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>$(MSBuildProjectDirectory)\obj\$(Configuration)\</IntermediateOutputPath>
<OutputType Condition="'$(OutputType)' == ''">Exe</OutputType>
<OutputPath>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\</OutputPath>
<IntermediateOutputPath>$(MSBuildProjectDirectory)\obj\$(Configuration)\$(Platform)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup>
@@ -16,8 +16,32 @@
<NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
</PropertyGroup>
<!--
When building a library as a reference, the returned build outputs include both the
IL assembly produced by CSC and the native obj produced by Ilc. Separate the native
object file here so it isn't passed to CSC, and instead redirect it to be picked up
by the LinkNative target.
-->
<Target Name="RemoveObjFiles" AfterTargets="ResolveProjectReferences" Condition="'$(IlcMultiModule)' == 'true'">
<ItemGroup>
<ObjFiles Include="@(_ResolvedProjectReferencePaths)" Condition="'%(Extension)' == '.obj'" />
<LinkerArg Include="@(_ResolvedProjectReferencePaths)" Condition="'%(Extension)' == '.obj'" />
<IlcReference Include="@(_ResolvedProjectReferencePaths)" Condition="'%(Extension)' == '.dll'" />
<_ResolvedProjectReferencePaths Remove="@(ObjFiles)" />
</ItemGroup>
</Target>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<!-- Use the source primary copy for development convenience -->
<Import Project="$(MSBuildThisFileDirectory)\..\..\Test.Common.targets" />
</Project>
<ItemGroup>
<CustomLinkerArg Include="$(AdditionalLinkerFlags)" />
</ItemGroup>
<ItemGroup>
<IlcArg Include="--targetarch=$(Platform)" />
</ItemGroup>
</Project>