adding guards around import of shared MSBuild props/targets to elimin…

…ate warning MSB4011
PowerShellOrg · Feb 7, 2018 · 5e17de8 · 5e17de8
1 parent 7384c45
commit 5e17de8
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>