* 解决Bug，Fallback 重复导入警告问题。

mingkuang-Chuyu · Jan 14, 2020 · 767edef · 767edef
1 parent 68e292f
commit 767edef
Show file tree

Hide file tree

Showing 14 changed files with 107 additions and 84 deletions.
diff --git a/Fallback/NuGetImportAfterCppProps.props b/Fallback/NuGetImportAfterCppProps.props
@@ -2,26 +2,26 @@
 
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
-  </PropertyGroup>
-
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '' Or '$(VisualStudioVersion)'  &lt; '16.0'">
-      <PropertyGroup Condition="'$(YY_Import_Helper_Backup_UserRootDir)' != ''">
+      <PropertyGroup Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true'">
         <UserRootDir>$(YY_Import_Helper_Backup_UserRootDir)</UserRootDir>
         <YY_Import_Helper_Backup_UserRootDir></YY_Import_Helper_Backup_UserRootDir>
       </PropertyGroup>
     </When>
     <Otherwise>
-      <PropertyGroup>
+      <PropertyGroup Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true'">
         <ForceImportAfterCppProps>$(YY_Import_Helper_Backup_ForceImportAfterCppProps)</ForceImportAfterCppProps>
         <YY_Import_Helper_Backup_ForceImportAfterCppProps></YY_Import_Helper_Backup_ForceImportAfterCppProps>
       </PropertyGroup>
     </Otherwise>
   </Choose>
-    
-  <ImportGroup Label="PropertySheets">
+
+  <ImportGroup Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true'">
     <Import Project="$(NuGetImportAfterCppProps)" Condition="'$(NuGetImportAfterCppProps)' != ''"/>
   </ImportGroup>
+
+  <PropertyGroup>
+    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
+  </PropertyGroup>
 </Project>
diff --git a/Fallback/NuGetImportAfterCppTargets.targets b/Fallback/NuGetImportAfterCppTargets.targets
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
-  </PropertyGroup>
-
-  <PropertyGroup>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
+  <PropertyGroup Condition="'$(NuGetImportAfterCppTargetsComplete)' != 'true'">
     <ForceImportAfterCppTargets>$(YY_Import_Helper_Backup_ForceImportAfterCppTargets)</ForceImportAfterCppTargets>
     <YY_Import_Helper_Backup_ForceImportAfterCppTargets></YY_Import_Helper_Backup_ForceImportAfterCppTargets>
   </PropertyGroup>
 
-  <Import Project="$(NuGetImportAfterCppTargets)" Condition="'$(NuGetImportAfterCppTargets)' != ''"/>
+  <ImportGroup Condition="'$(NuGetImportAfterCppTargetsComplete)' != 'true'">
+    <Import Project="$(NuGetImportAfterCppTargets)" Condition="'$(NuGetImportAfterCppTargets)' != ''"/>
+  </ImportGroup>
+
+  <PropertyGroup>
+    <NuGetImportAfterCppTargetsComplete>true</NuGetImportAfterCppTargetsComplete>
+  </PropertyGroup>
 </Project>
diff --git a/Fallback/NuGetImportBeforeCppProps.props b/Fallback/NuGetImportBeforeCppProps.props
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(VisualStudioVersion)' != '' And '$(VisualStudioVersion)'  >= '16.0'">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
+  <PropertyGroup Condition="'$(NuGetImportBeforeCppPropsComplete)' != 'true' And '$(VisualStudioVersion)' != '' And '$(VisualStudioVersion)'  >= '16.0'">
     <ForceImportBeforeCppProps>$(YY_Import_Helper_Backup_ForceImportBeforeCppProps)</ForceImportBeforeCppProps>
     <YY_Import_Helper_Backup_ForceImportBeforeCppProps></YY_Import_Helper_Backup_ForceImportBeforeCppProps>
   </PropertyGroup>
 
-  <ImportGroup Label="PropertySheets">
+  <ImportGroup Condition="'$(NuGetImportBeforeCppPropsComplete)' != 'true'">
     <Import Project="$(NuGetImportBeforeCppProps)" Condition="'$(NuGetImportBeforeCppProps)' != ''"/>
   </ImportGroup>
+
+  <PropertyGroup>
+    <NuGetImportBeforeCppPropsComplete>true</NuGetImportBeforeCppPropsComplete>
+  </PropertyGroup>
 </Project>
diff --git a/Fallback/NuGetImportBeforeCppTargets.targets b/Fallback/NuGetImportBeforeCppTargets.targets
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
-  </PropertyGroup>
-
-  <PropertyGroup>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
+  <PropertyGroup Condition="'$(NuGetImportBeforeCppTargetsComplete)' != 'true'">
     <ForceImportBeforeCppTargets>$(YY_Import_Helper_Backup_ForceImportBeforeCppTargets)</ForceImportBeforeCppTargets>
     <YY_Import_Helper_Backup_ForceImportBeforeCppTargets></YY_Import_Helper_Backup_ForceImportBeforeCppTargets>
   </PropertyGroup>
 
-  <Import Project="$(NuGetImportBeforeCppTargets)" Condition="'$(NuGetImportBeforeCppTargets)' != ''"/>
+  <ImportGroup Condition="'$(NuGetImportBeforeCppTargetsComplete)' != 'true'">
+    <Import Project="$(NuGetImportBeforeCppTargets)" Condition="'$(NuGetImportBeforeCppTargets)' != ''"/>
+  </ImportGroup>
+
+  <PropertyGroup>
+    <NuGetImportBeforeCppTargetsComplete>true</NuGetImportBeforeCppTargetsComplete>
+  </PropertyGroup>
 </Project>
diff --git a/Thunks/Downlevel/Microsoft.Cpp.ARM.user.props b/Thunks/Downlevel/Microsoft.Cpp.ARM.user.props
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?> 
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true'">
     <UserRootDir>$(YY_Import_Helper_Backup_UserRootDir)</UserRootDir>
     <YY_Import_Helper_Backup_UserRootDir></YY_Import_Helper_Backup_UserRootDir>
-    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
   </PropertyGroup>
 
 
-  <ImportGroup Label="PropertySheets">
+  <ImportGroup Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true'">
     <!--加载用户配置-->
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"/>
     <Import Project="$(NuGetImportAfterCppProps)" Condition="'$(NuGetImportAfterCppProps)' != ''"/>
   </ImportGroup>
+
+  <PropertyGroup>
+    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
+  </PropertyGroup>
 </Project>
diff --git a/Thunks/Downlevel/Microsoft.Cpp.ARM64.user.props b/Thunks/Downlevel/Microsoft.Cpp.ARM64.user.props
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true'">
     <UserRootDir>$(YY_Import_Helper_Backup_UserRootDir)</UserRootDir>
     <YY_Import_Helper_Backup_UserRootDir></YY_Import_Helper_Backup_UserRootDir>
-    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
   </PropertyGroup>
 
 
-  <ImportGroup Label="PropertySheets">
+  <ImportGroup Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true'">
     <!--加载用户配置-->
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"/>
     <Import Project="$(NuGetImportAfterCppProps)" Condition="'$(NuGetImportAfterCppProps)' != ''"/>
   </ImportGroup>
+
+  <PropertyGroup>
+    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
+  </PropertyGroup>
 </Project>
diff --git a/Thunks/Downlevel/Microsoft.Cpp.Win32.user.props b/Thunks/Downlevel/Microsoft.Cpp.Win32.user.props
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true'">
     <UserRootDir>$(YY_Import_Helper_Backup_UserRootDir)</UserRootDir>
     <YY_Import_Helper_Backup_UserRootDir></YY_Import_Helper_Backup_UserRootDir>
-    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
   </PropertyGroup>
 
 
-  <ImportGroup Label="PropertySheets">
+  <ImportGroup Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true'">
     <!--加载用户配置-->
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"/>
     <Import Project="$(NuGetImportAfterCppProps)" Condition="'$(NuGetImportAfterCppProps)' != ''"/>
   </ImportGroup>
+
+  <PropertyGroup>
+    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
+  </PropertyGroup>
 </Project>
diff --git a/Thunks/Downlevel/Microsoft.Cpp.x64.user.props b/Thunks/Downlevel/Microsoft.Cpp.x64.user.props
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true'">
     <UserRootDir>$(YY_Import_Helper_Backup_UserRootDir)</UserRootDir>
     <YY_Import_Helper_Backup_UserRootDir></YY_Import_Helper_Backup_UserRootDir>
-    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
   </PropertyGroup>
 
 
-  <ImportGroup Label="PropertySheets">
+  <ImportGroup Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true'">
     <!--加载用户配置-->
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"/>
     <Import Project="$(NuGetImportAfterCppProps)" Condition="'$(NuGetImportAfterCppProps)' != ''"/>
   </ImportGroup>
+
+  <PropertyGroup>
+    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
+  </PropertyGroup>
 </Project>
diff --git a/Thunks/NuGetImportAfterCppProps.props b/Thunks/NuGetImportAfterCppProps.props
@@ -2,19 +2,19 @@
 
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
-  </PropertyGroup>
-
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true'">
     <ForceImportAfterCppProps>$(YY_Import_Helper_Backup_ForceImportAfterCppProps)</ForceImportAfterCppProps>
     <YY_Import_Helper_Backup_ForceImportAfterCppProps></YY_Import_Helper_Backup_ForceImportAfterCppProps>
   </PropertyGroup>
-
-  <!--先导入之前的 ForceImportAfterCppProps，这是从兼容性考虑。-->
-  <Import Condition="Exists('$(ForceImportAfterCppProps)')" Project="$(ForceImportAfterCppProps)" />
 
-  <ImportGroup Label="PropertySheets">
+  <ImportGroup Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true'">
+    <!--先导入之前的 ForceImportAfterCppProps，这是从兼容性考虑。-->
+    <Import Condition="Exists('$(ForceImportAfterCppProps)')" Project="$(ForceImportAfterCppProps)" />
+
     <Import Project="$(NuGetImportAfterCppProps)" Condition="'$(NuGetImportAfterCppProps)' != ''"/>
   </ImportGroup>
+
+  <PropertyGroup>
+    <NuGetImportAfterCppPropsComplete>true</NuGetImportAfterCppPropsComplete>
+  </PropertyGroup>
 </Project>
diff --git a/Thunks/NuGetImportAfterCppTargets.targets b/Thunks/NuGetImportAfterCppTargets.targets
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NuGetImportAfterCppTargetsComplete>true</NuGetImportAfterCppTargetsComplete>
-  </PropertyGroup>
-
-  <PropertyGroup>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
+  <PropertyGroup Condition="'$(NuGetImportAfterCppTargetsComplete)' != 'true'">
     <ForceImportAfterCppTargets>$(YY_Import_Helper_Backup_ForceImportAfterCppTargets)</ForceImportAfterCppTargets>
     <YY_Import_Helper_Backup_ForceImportAfterCppTargets></YY_Import_Helper_Backup_ForceImportAfterCppTargets>
   </PropertyGroup>
 
-  <!--先导入之前的 ForceImportAfterCppTargets，这是从兼容性考虑。-->
-  <Import Condition="Exists('$(ForceImportAfterCppTargets)')" Project="$(ForceImportAfterCppTargets)" />
+  <ImportGroup Condition="'$(NuGetImportAfterCppTargetsComplete)' != 'true'">
+    <!--先导入之前的 ForceImportAfterCppTargets，这是从兼容性考虑。-->
+    <Import Condition="Exists('$(ForceImportAfterCppTargets)')" Project="$(ForceImportAfterCppTargets)" />
 
-  <Import Project="$(NuGetImportAfterCppTargets)" Condition="'$(NuGetImportAfterCppTargets)' != ''"/>
+    <Import Project="$(NuGetImportAfterCppTargets)" Condition="'$(NuGetImportAfterCppTargets)' != ''"/>
+  </ImportGroup>
+
+  <PropertyGroup>
+    <NuGetImportAfterCppTargetsComplete>true</NuGetImportAfterCppTargetsComplete>
+  </PropertyGroup>
 </Project>
diff --git a/Thunks/NuGetImportBeforeCppProps.props b/Thunks/NuGetImportBeforeCppProps.props
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NuGetImportBeforeCppPropsComplete>true</NuGetImportBeforeCppPropsComplete>
-  </PropertyGroup>
-
-  <PropertyGroup>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
+  <PropertyGroup Condition="'$(NuGetImportBeforeCppPropsComplete)' != 'true'">
     <ForceImportBeforeCppProps>$(YY_Import_Helper_Backup_ForceImportBeforeCppProps)</ForceImportBeforeCppProps>
     <YY_Import_Helper_Backup_ForceImportBeforeCppProps></YY_Import_Helper_Backup_ForceImportBeforeCppProps>
   </PropertyGroup>
 
-  <!--先导入之前的 ForceImportBeforeCppProps，这是从兼容性考虑。-->
-  <Import Condition="Exists('$(ForceImportBeforeCppProps)')" Project="$(ForceImportBeforeCppProps)" />
+  <ImportGroup Condition="'$(NuGetImportBeforeCppPropsComplete)' != 'true'">
+    <!--先导入之前的 ForceImportBeforeCppProps，这是从兼容性考虑。-->
+    <Import Condition="Exists('$(ForceImportBeforeCppProps)')" Project="$(ForceImportBeforeCppProps)" />
 
-  <ImportGroup Label="PropertySheets">
     <Import Project="$(NuGetImportBeforeCppProps)" Condition="'$(NuGetImportBeforeCppProps)' != ''"/>
   </ImportGroup>
+
+  <PropertyGroup>
+    <NuGetImportBeforeCppPropsComplete>true</NuGetImportBeforeCppPropsComplete>
+  </PropertyGroup>
 </Project>
diff --git a/Thunks/NuGetImportBeforeCppTargets.targets b/Thunks/NuGetImportBeforeCppTargets.targets
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NuGetImportBeforeCppTargetsComplete>true</NuGetImportBeforeCppTargetsComplete>
-  </PropertyGroup>
-
-  <PropertyGroup>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
+  <PropertyGroup Condition="'$(NuGetImportBeforeCppTargetsComplete)' != 'true'">
     <ForceImportBeforeCppTargets>$(YY_Import_Helper_Backup_ForceImportBeforeCppTargets)</ForceImportBeforeCppTargets>
     <YY_Import_Helper_Backup_ForceImportBeforeCppTargets></YY_Import_Helper_Backup_ForceImportBeforeCppTargets>
   </PropertyGroup>
 
-  <!--先导入之前的 ForceImportBeforeCppTargets，这是从兼容性考虑。-->
-  <Import Condition="Exists('$(ForceImportBeforeCppTargets)')" Project="$(ForceImportBeforeCppTargets)" />
+  <ImportGroup Condition="'$(NuGetImportBeforeCppTargetsComplete)' != 'true'">
+    <!--先导入之前的 ForceImportBeforeCppTargets，这是从兼容性考虑。-->
+    <Import Condition="Exists('$(ForceImportBeforeCppTargets)')" Project="$(ForceImportBeforeCppTargets)" />
 
-  <Import Project="$(NuGetImportBeforeCppTargets)" Condition="'$(NuGetImportBeforeCppTargets)' != ''"/>
+    <Import Project="$(NuGetImportBeforeCppTargets)" Condition="'$(NuGetImportBeforeCppTargets)' != ''"/>
+  </ImportGroup>
+
+  <PropertyGroup>
+    <NuGetImportBeforeCppTargetsComplete>true</NuGetImportBeforeCppTargetsComplete>
+  </PropertyGroup>
 </Project>
diff --git a/YY.NuGet.Import.Helper.props b/YY.NuGet.Import.Helper.props
@@ -21,7 +21,7 @@ $(VisualStudioVersion)
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NuGetImportHelperVersion>1.0.0.1</NuGetImportHelperVersion>
+    <NuGetImportHelperVersion>1.0.0.2</NuGetImportHelperVersion>
 
     <NuGetForceImportBeforeCppPropsFallback>$(MSBuildThisFileDirectory)Fallback\NuGetImportBeforeCppProps.props</NuGetForceImportBeforeCppPropsFallback>
     <NuGetForceImportAfterCppPropsFallback>$(MSBuildThisFileDirectory)Fallback\NuGetImportAfterCppProps.props</NuGetForceImportAfterCppPropsFallback>

diff --git a/readme.md b/readme.md
@@ -80,7 +80,7 @@
     <metadata>
         <!--...-->
         <dependencies>
-            <dependency id="YY.NuGet.Import.Helper" version="1.0.0.1" />
+            <dependency id="YY.NuGet.Import.Helper" version="1.0.0.2" />
             <!--...-->
         </dependencies>
     </metadata>
@@ -144,4 +144,7 @@
 * 添加 $(VCTargetsPath)\Microsoft.Cpp.props 之前导入时机
 * 添加 $(VCTargetsPath)\Microsoft.Cpp.props 之后导入时机
 * 添加 $(VCTargetsPath)\Microsoft.Cpp.targets 之前导入时机
-* 添加 $(VCTargetsPath)\Microsoft.Cpp.targets 之后导入时机
+* 添加 $(VCTargetsPath)\Microsoft.Cpp.targets 之后导入时机
+
+### v1.0.0.2 - 2020-01-14
+* 解决Bug，Fallback 重复导入警告问题。