diff options
| author | Eric StJohn <ericstj@microsoft.com> | 2017-04-07 01:42:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 01:42:15 +0300 |
| commit | 520e9495066efa66a9e395d129c0d74e7bdf49f9 (patch) | |
| tree | fe6438ad9f7e190a42c88476f7959d55c3e95184 /dir.props | |
| parent | 134510c954d37781546dc56616af4d5953d0172a (diff) | |
| parent | ce70298da731f5d7bae36ee13106c197dde699e8 (diff) | |
Merge pull request #18032 from ericstj/disableIllinkAlpine
Move ILLink alpine workaround after RuntimeOS is set
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -41,9 +41,6 @@ <GeneratedProjectJsonDir>$(ObjDir)generated</GeneratedProjectJsonDir> <CodeAnalysisRuleset>$(MSBuildThisFileDirectory)CodeAnalysis.ruleset</CodeAnalysisRuleset> - - <!-- illink fails to run on Alpine CLI : https://github.com/dotnet/corefx/issues/18029 --> - <ILLinkTrimAssembly Condition="$(RuntimeOS.StartsWith('alpine'))">false</ILLinkTrimAssembly> </PropertyGroup> <!-- Temporarily enable local build of tools --> @@ -151,6 +148,11 @@ <Import Project="$(BuildConfigurationImportFile)" Condition="Exists('$(BuildConfigurationImportFile)')" /> + <PropertyGroup> + <!-- illink fails to run on Alpine CLI : https://github.com/dotnet/corefx/issues/18029 --> + <ILLinkTrimAssembly Condition="$(RuntimeOS.StartsWith('alpine'))">false</ILLinkTrimAssembly> + </PropertyGroup> + <!-- Import packaging props --> <Import Project="$(MSBuildThisFileDirectory)Packaging.props"/> |