Skip to content

Commit

Permalink
haiku: disable trim/api-compat targets
Browse files Browse the repository at this point in the history
* Getting trim errors, build 'succeeds' now
  • Loading branch information
jessicah committed Jul 20, 2021
1 parent 46b40cb commit 10e4e8b
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/libraries/src.proj
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
$(MSBuildThisFileDirectory)Microsoft.VisualBasic.Core\src\Microsoft.VisualBasic.Core.vbproj;
$(MSBuildThisFileDirectory)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj"
Exclude="@(NonNetCoreAppProject)" />
<ManualShimProject Include="shims\manual\*.csproj" />
<ApiCompatProject Include="shims\ApiCompat.proj"
<!--<ManualShimProject Include="shims\manual\*.csproj" />-->
<!--<ApiCompatProject Include="shims\ApiCompat.proj"
Condition="'$(DotNetBuildFromSource)' != 'true' and
('$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == '') and
'$(RunApiCompat)' != 'false'" />
'$(RunApiCompat)' != 'false'" />-->
</ItemGroup>

<ItemGroup>
Expand All @@ -39,22 +39,22 @@
Properties="$(TraversalGlobalProperties)" />
</Target>

<Target Name="BuildManualShims"
<!--<Target Name="BuildManualShims"
AfterTargets="BuildNonNetCoreAppProjects"
Condition="'@(ManualShimProject)' != ''">
<MSBuild Targets="Build"
Projects="@(ManualShimProject)"
Properties="$(TraversalGlobalProperties)" />
</Target>
</Target>-->

<Import Project="$(MSBuildThisFileDirectory)illink-trimassemblies.targets"
Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''" />
<!--<Import Project="$(MSBuildThisFileDirectory)illink-trimassemblies.targets"
Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''" />-->

<Target Name="RunApiCompat"
<!--<Target Name="RunApiCompat"
Condition="'@(ApiCompatProject)' != ''"
AfterTargets="BuildManualShims">
<MSBuild Targets="Build"
Projects="@(ApiCompatProject)"
Properties="$(TraversalGlobalProperties)" />
</Target>
</Target>-->
</Project>

0 comments on commit 10e4e8b

Please sign in to comment.