From 5e17de8b7a4abadba44a167f29b7d29c057265fe Mon Sep 17 00:00:00 2001
From: Eugene Bekker <ebekker@users.noreply.github.com>
Date: Wed, 7 Feb 2018 06:13:23 -0500
Subject: [PATCH] adding guards around import of shared MSBuild props/targets
 to eliminate warning MSB4011

---
 TugDSC.common.props                                       | 5 +++++
 TugDSC.sharedasm.props                                    | 8 +++++++-
 src/TugDSC.Abstractions/TugDSC.Abstractions.csproj        | 6 ++++--
 src/TugDSC.Client.CLIApp/TugDSC.Client.CLIApp.csproj      | 6 ++++--
 .../TugDSC.Server.Abstractions.csproj                     | 6 ++++--
 .../TugDSC.Server.WebAppHost.csproj                       | 6 ++++--
 .../TugDSC.Testing.MSTest/TugDSC.Testing.MSTest.csproj    | 6 ++++--
 7 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/TugDSC.common.props b/TugDSC.common.props
index 2cdc3eb..c67cf61 100644
--- a/TugDSC.common.props
+++ b/TugDSC.common.props
@@ -1,5 +1,10 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <PropertyGroup>
+    <!-- We define this flag to allow us to guard against multiple imports -->
+    <TugDSC_common_props>true</TugDSC_common_props>
+  </PropertyGroup>
+
   <!--
     - References:
     -   * https://docs.microsoft.com/en-us/dotnet/core/tools/csproj
diff --git a/TugDSC.sharedasm.props b/TugDSC.sharedasm.props
index 8eacc42..e179278 100644
--- a/TugDSC.sharedasm.props
+++ b/TugDSC.sharedasm.props
@@ -1,11 +1,17 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <PropertyGroup>
+    <!-- We define this flag to allow us to guard against multiple imports -->
+    <TugDSC_sharedasm_props>true</TugDSC_sharedasm_props>
+  </PropertyGroup>
+
   <!--
     - References:
     -  * https://github.com/dotnet/sdk/issues/2#issuecomment-238368991
     -->
 
-  <Import Project="$(MSBuildThisFileDirectory)/TugDSC.common.props" />
+  <Import Project="$(MSBuildThisFileDirectory)/TugDSC.common.props"
+      Condition="'$(TugDSC_common_props)' == ''" />
 
   
   <PropertyGroup>
diff --git a/src/TugDSC.Abstractions/TugDSC.Abstractions.csproj b/src/TugDSC.Abstractions/TugDSC.Abstractions.csproj
index 3eefd92..02ada75 100644
--- a/src/TugDSC.Abstractions/TugDSC.Abstractions.csproj
+++ b/src/TugDSC.Abstractions/TugDSC.Abstractions.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.common.props" />
-  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.sharedasm.props" />
+  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.common.props"
+      Condition="'$(TugDSC_common_props)' == ''" />
+  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.sharedasm.props"
+      Condition="'$(TugDSC_sharedasm_props)' == ''" />
 
   <PropertyGroup>
     <TargetFrameworks>$(NETStandardMoniker);$(NETFrameworkMoniker)</TargetFrameworks>
diff --git a/src/TugDSC.Client.CLIApp/TugDSC.Client.CLIApp.csproj b/src/TugDSC.Client.CLIApp/TugDSC.Client.CLIApp.csproj
index 1326372..ca6d623 100644
--- a/src/TugDSC.Client.CLIApp/TugDSC.Client.CLIApp.csproj
+++ b/src/TugDSC.Client.CLIApp/TugDSC.Client.CLIApp.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.common.props" />
-  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.sharedasm.props" />
+  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.common.props"
+      Condition="'$(TugDSC_common_props)' == ''" />
+  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.sharedasm.props"
+      Condition="'$(TugDSC_sharedasm_props)' == ''" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
diff --git a/src/TugDSC.Server.Abstractions/TugDSC.Server.Abstractions.csproj b/src/TugDSC.Server.Abstractions/TugDSC.Server.Abstractions.csproj
index 7e9ffa4..7738a70 100644
--- a/src/TugDSC.Server.Abstractions/TugDSC.Server.Abstractions.csproj
+++ b/src/TugDSC.Server.Abstractions/TugDSC.Server.Abstractions.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.common.props" />
-  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.sharedasm.props" />
+  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.common.props"
+      Condition="'$(TugDSC_common_props)' == ''" />
+  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.sharedasm.props"
+      Condition="'$(TugDSC_sharedasm_props)' == ''" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/TugDSC.Server.WebAppHost/TugDSC.Server.WebAppHost.csproj b/src/TugDSC.Server.WebAppHost/TugDSC.Server.WebAppHost.csproj
index bed1de6..1fac743 100644
--- a/src/TugDSC.Server.WebAppHost/TugDSC.Server.WebAppHost.csproj
+++ b/src/TugDSC.Server.WebAppHost/TugDSC.Server.WebAppHost.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.common.props" />
-  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.sharedasm.props" />
+  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.common.props"
+      Condition="'$(TugDSC_common_props)' == ''" />
+  <Import Project="$(MSBuildThisFileDirectory)/../../TugDSC.sharedasm.props"
+      Condition="'$(TugDSC_sharedasm_props)' == ''" />
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
diff --git a/src/testing/TugDSC.Testing.MSTest/TugDSC.Testing.MSTest.csproj b/src/testing/TugDSC.Testing.MSTest/TugDSC.Testing.MSTest.csproj
index 17aaa76..5e3c4a3 100644
--- a/src/testing/TugDSC.Testing.MSTest/TugDSC.Testing.MSTest.csproj
+++ b/src/testing/TugDSC.Testing.MSTest/TugDSC.Testing.MSTest.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(MSBuildThisFileDirectory)/../../../TugDSC.common.props" />
-  <Import Project="$(MSBuildThisFileDirectory)/../../../TugDSC.sharedasm.props" />
+  <Import Project="$(MSBuildThisFileDirectory)/../../../TugDSC.common.props"
+      Condition="'$(TugDSC_common_props)' == ''" />
+  <Import Project="$(MSBuildThisFileDirectory)/../../../TugDSC.sharedasm.props"
+      Condition="'$(TugDSC_sharedasm_props)' == ''" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>