From bcad85aef14d1df6b0a4fefe6ee67fc4adbeb109 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 15 Jul 2017 23:53:40 -0500
Subject: [PATCH] Fix failure to recalculate Antlr4DesignTimeBuild in
 multi-targeting projects

---
 .../CSharp/Antlr4BuildTasks/Antlr4.net40.targets   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/runtime/CSharp/Antlr4BuildTasks/Antlr4.net40.targets b/runtime/CSharp/Antlr4BuildTasks/Antlr4.net40.targets
index ff158dd8..03776a3f 100644
--- a/runtime/CSharp/Antlr4BuildTasks/Antlr4.net40.targets
+++ b/runtime/CSharp/Antlr4BuildTasks/Antlr4.net40.targets
@@ -25,11 +25,6 @@
     </LoadTimeSensitiveProperties>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <Antlr4DesignTimeBuild>false</Antlr4DesignTimeBuild>
-    <Antlr4DesignTimeBuild Condition="'$(DesignTimeBuild)' == 'true' OR '$(BuildingProject)' != 'true'">true</Antlr4DesignTimeBuild>
-  </PropertyGroup>
-
   <PropertyGroup>
     <Antlr4BuildTaskLocation Condition="'$(Antlr4BuildTaskPath)'==''">$(MSBuildBinPath)</Antlr4BuildTaskLocation>
     <Antlr4BuildTaskLocation Condition="'$(Antlr4BuildTaskPath)'!=''">$(Antlr4BuildTaskPath)</Antlr4BuildTaskLocation>
@@ -98,6 +93,10 @@
   </PropertyGroup>
 
   <Target Name="Antlr4DesignTimeGrammarCompilation">
+    <PropertyGroup>
+      <Antlr4DesignTimeBuild Condition="'$(DesignTimeBuild)' == 'true' OR '$(BuildingProject)' != 'true'">true</Antlr4DesignTimeBuild>
+    </PropertyGroup>
+
     <!-- Only if we are not actually performing a compile i.e. we are in design mode -->
     <CallTarget Condition="'$(Antlr4DesignTimeBuild)' == 'true'"
                 Targets="Antlr4Compile" />
@@ -114,6 +113,11 @@
       <Antlr4GeneratedCodeFiles Remove="@(Antlr4GeneratedCodeFiles)" />
     </ItemGroup>
 
+    <PropertyGroup>
+      <Antlr4DesignTimeBuild>false</Antlr4DesignTimeBuild>
+      <Antlr4DesignTimeBuild Condition="'$(DesignTimeBuild)' == 'true' OR '$(BuildingProject)' != 'true'">true</Antlr4DesignTimeBuild>
+    </PropertyGroup>
+
     <Antlr4ClassGenerationTask
       ToolPath="$(Antlr4ToolLocation)"
       JavaVendor="$(Antlr4JavaVendor)"