From e7241b7cec4f9009d74d9a5bb5e01186bd39bb4f Mon Sep 17 00:00:00 2001
From: mingkuang <mingkuang@live.com>
Date: Wed, 31 Jul 2024 20:36:46 +0800
Subject: [PATCH] =?UTF-8?q?Bug=20#1,=20=E8=A7=A3=E5=86=B3=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3VS2015=E7=AD=89=E8=80=81=E7=9A=84=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=AE=89=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YY.NuGet.Import.Helper.nuspec  | 5 +----
 YY.NuGet.Import.Helper.props   | 2 +-
 YY.NuGet.Import.Helper.targets | 7 ++++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/YY.NuGet.Import.Helper.nuspec b/YY.NuGet.Import.Helper.nuspec
index e6c857c..52cbba6 100644
--- a/YY.NuGet.Import.Helper.nuspec
+++ b/YY.NuGet.Import.Helper.nuspec
@@ -21,10 +21,7 @@ $(VCTargetsPath)\Microsoft.Cpp.targets 之后
 全面增强C++ Import，让你的NuGet包创造更多可能！
 
 </description>
-    <releaseNotes>
-      * 新增Fea，为VS2008平台工具集提供支持。
-      * 新增Fea，为NuGet PC（packages.config）模式提供 ExcludedFromBuild 支持。
-    </releaseNotes>
+    <releaseNotes>$releaseNotes$</releaseNotes>
     <copyright>Copyright © 2020 YY</copyright>
     <tags>YY Import Import.Helper native nativepackage</tags>
     <repository type="git" url="https://github.com/mingkuang-Chuyu/YY.NuGet.Import.Helper.git" branch="master" commit="$commit$" />
diff --git a/YY.NuGet.Import.Helper.props b/YY.NuGet.Import.Helper.props
index 7bba91d..9f6e953 100644
--- 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.4</NuGetImportHelperVersion>
+    <NuGetImportHelperVersion>1.0.1</NuGetImportHelperVersion>
 
     <NuGetForceImportBeforeCppPropsFallback>$(MSBuildThisFileDirectory)Fallback\NuGetImportBeforeCppProps.props</NuGetForceImportBeforeCppPropsFallback>
     <NuGetForceImportAfterCppPropsFallback>$(MSBuildThisFileDirectory)Fallback\NuGetImportAfterCppProps.props</NuGetForceImportAfterCppPropsFallback>
diff --git a/YY.NuGet.Import.Helper.targets b/YY.NuGet.Import.Helper.targets
index 50e9cce..fac30e4 100644
--- a/YY.NuGet.Import.Helper.targets
+++ b/YY.NuGet.Import.Helper.targets
@@ -10,8 +10,9 @@
     <Error Condition="'$(NuGetImportAfterCppPropsComplete)' != 'true' and '$(NuGetImportAfterCppProps)' != ''" Text="$(NuGetImportAfterCppPropsHelpText)" />
   </Target>
 
+  <!--只有VS2017或者更高版本自带的MSBuild才支持 Update，所以我们对只在 $(VisualStudioVersion) >= 15.0 上尝试插入NuGet源码包-->
   <!--处理NuGet PackageReference引用的Content-->
-  <Target Name="YY_ResolveNuGetPackagesPackageReferenceContent" AfterTargets="BeforeClCompile" Outputs="'%(Content.FileName)'">
+  <Target Name="YY_ResolveNuGetPackagesPackageReferenceContent" AfterTargets="BeforeClCompile" Outputs="'%(Content.FileName)'" Condition="'$(VisualStudioVersion)' >= '15.0'">
     <PropertyGroup>
       <ThisNuGetPackageId>%(Content.FileName)</ThisNuGetPackageId>
       <ThisNuGetPackageId Condition="'%(Content.FileName)' != '%(Content.NuGetPackageId)'"></ThisNuGetPackageId>
@@ -28,7 +29,7 @@
 
   <!--处理传统NuGet引用的Content-->
   <!--2008工具集添加Txt后会变成None节点，因此我们再额外处理下None-->
-  <Target Name="YY_ResolveNuGetPackagesNoneContent" AfterTargets="BeforeClCompile" Outputs="'%(None.FileName)'" >
+  <Target Name="YY_ResolveNuGetPackagesNoneContent" AfterTargets="BeforeClCompile" Outputs="'%(None.FileName)'" Condition="'$(VisualStudioVersion)' >= '15.0'" >
     <PropertyGroup>
       <ThisNuGetPackageId>%(None.FileName)</ThisNuGetPackageId>
       <ThisNuGetPackageExcludedFromBuild>%(None.ExcludedFromBuild)</ThisNuGetPackageExcludedFromBuild>
@@ -41,7 +42,7 @@
     </ItemGroup>
   </Target>
   <!--2012开始 IDE 支持Text了，我们解析下 Text-->
-  <Target Name="YY_ResolveNuGetPackagesTextContent" AfterTargets="BeforeClCompile" Outputs="'%(Text.FileName)'" >
+  <Target Name="YY_ResolveNuGetPackagesTextContent" AfterTargets="BeforeClCompile" Outputs="'%(Text.FileName)'" Condition="'$(VisualStudioVersion)' >= '15.0'" >
     <PropertyGroup>
       <ThisNuGetPackageId>%(Text.FileName)</ThisNuGetPackageId>
       <ThisNuGetPackageExcludedFromBuild>%(Text.ExcludedFromBuild)</ThisNuGetPackageExcludedFromBuild>