Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric St. John <ericstj@microsoft.com>2017-04-07 01:40:20 +0300
committerEric St. John <ericstj@microsoft.com>2017-04-07 01:40:20 +0300
commitce70298da731f5d7bae36ee13106c197dde699e8 (patch)
treeb93f0edbf06f4059edc5039ddc3b260ea856cdfb /dir.props
parent41bf64c4fc526a7ec7fbe6a5b25f3b3336812297 (diff)
Move ILLink alpine workaround after RuntimeOS is set
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props8
1 files changed, 5 insertions, 3 deletions
diff --git a/dir.props b/dir.props
index b2ca02d977..53ad2cb69c 100644
--- a/dir.props
+++ b/dir.props
@@ -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"/>