From 0586375cf82fd50de99e268e5685b1f72d3b8989 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Tue, 5 Sep 2017 15:10:15 -0700
Subject: [PATCH] Avoid importing incompatible .props files for signing build

(cherry picked from commit c2ca5121890d417db343abf568a1f5d99cae6444)
---
 Directory.Build.props | 29 ++++++++++++++++++-----------
 build/Signing.proj    |  7 +++++++
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 990034d5f..f0719c9ce 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -36,9 +36,6 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj
 
   <Import Project="build/BranchInfo.props" />
 
-  <Import Project="build/BundledTools.props" />
-  <Import Project="build/BundledSdks.props" />
-  <Import Project="build/BundledTemplates.props" />
   <Import Project="build/DependencyVersions.props" />
   <Import Project="build/Version.props" />
   <Import Project="build/Branding.props" />
@@ -49,13 +46,23 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj
   <Import Project="build/MSBuildExtensions.props" />
   <Import Project="build/SetupPreviousStage.props" />
   <Import Project="build/OutputDirectories.props" />
-  <Import Project="build/BuildDefaults.props" />
-  <Import Project="build/VersionBadge.props" />
-  <Import Project="build/BundledRuntimes.props" />
-  <Import Project="build/CrossGen.props" />
-  <Import Project="build/BackwardsCompatibilityRuntimes.props" />
 
-  <Import Project="build/AzureInfo.props" />
-  <Import Project="build/InstallerInfo.props" />
-  <Import Project="build/GenerateResxSource.targets" />
+  <ImportGroup Condition=" '$(BuildingSigningProject)' != 'true' ">
+    <!-- These imports aren't required for signing, and some of them have syntax which isn't supported in MSBuild 14,
+         which is what the signing build uses -->
+    <Import Project="build/BundledTools.props" />
+    <Import Project="build/BundledSdks.props" />
+    <Import Project="build/BundledTemplates.props" />
+
+    <Import Project="build/BuildDefaults.props" />
+    <Import Project="build/VersionBadge.props" />
+    <Import Project="build/BundledRuntimes.props" />
+    <Import Project="build/CrossGen.props" />
+    <Import Project="build/BackwardsCompatibilityRuntimes.props" />
+
+    <Import Project="build/AzureInfo.props" />
+    <Import Project="build/InstallerInfo.props" />
+    <Import Project="build/GenerateResxSource.targets" />
+  </ImportGroup>
+  
 </Project>
diff --git a/build/Signing.proj b/build/Signing.proj
index c403c324c..da686886a 100644
--- a/build/Signing.proj
+++ b/build/Signing.proj
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project InitialTargets="SetSigningProperties" DefaultTargets="SignFiles" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <!-- The signing infrastructure runs using MSBuild 14, which doesn't support some of the new syntax we're using.  So set the BuildingSingingProject
+         property here to avoid importing files we don't need for signing which would cause errors if imported when using MSBuild 14. -->
+    <BuildingSigningProject>true</BuildingSigningProject>
+  </PropertyGroup>
+  
   <Import Project="..\dir.props" />
   <Import Project="MicroBuild.props" />
   <Import Project="$(MicroBuildPropsAndTargetsPath)MicroBuild.Core.props" />