Fix issue with NuGet package not containg .targets files (#42)

microsoft · Sep 24, 2018 · 1e647ce · 1e647ce
1 parent ab1c3c4
commit 1e647ce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/SlnGen.Build.Tasks/SlnGen.Build.Tasks.csproj b/src/SlnGen.Build.Tasks/SlnGen.Build.Tasks.csproj
@@ -33,8 +33,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="build\SlnGen.targets" Pack="true" PackagePath="\" />
-    <None Update="buildCrossTargeting\SlnGen.targets" Pack="true" PackagePath="\" />
+    <None Include="build\SlnGen.targets" Pack="true" PackagePath="\build" />
+    <None Include="buildCrossTargeting\SlnGen.targets" Pack="true" PackagePath="\buildCrossTargeting" />
   </ItemGroup>
 
   <Target Name="_UpdatePackageId" BeforeTargets="$(PackDependsOn)" >

diff --git a/src/SlnGen.Build.Tasks/build/SlnGen.targets b/src/SlnGen.Build.Tasks/build/SlnGen.targets
@@ -2,13 +2,16 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Project="$(CustomBeforeSlnGenTargets)" Condition="'$(CustomBeforeSlnGenTargets)' != '' and Exists('$(CustomBeforeSlnGenTargets)')"/>
+
+  <PropertyGroup Condition=" '$(SlnGenAssemblyFile)' == '' ">
+    <SlnGenAssemblyFile Condition=" '$(MSBuildRuntimeType)' == '' ">$(MSBuildThisFileDirectory)net45\SlnGen.Build.Tasks.dll</SlnGenAssemblyFile>
+    <SlnGenAssemblyFile Condition=" '$(MSBuildRuntimeType)' == 'Full' ">$(MSBuildThisFileDirectory)net46\SlnGen.Build.Tasks.dll</SlnGenAssemblyFile>
+    <SlnGenAssemblyFile Condition=" '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)netstandard2.0\SlnGen.Build.Tasks.dll</SlnGenAssemblyFile>
+  </PropertyGroup>
 
   <PropertyGroup>
-    <SlnGenAssemblyFile Condition=" '$(SlnGenAssemblyFile)' == '' ">$(MSBuildThisFileDirectory)net45\SlnGen.Build.Tasks.dll</SlnGenAssemblyFile>
-
     <SlnGenGlobalProperties Condition=" '$(SlnGenGlobalProperties)' != '' ">DesignTimeBuild=true;BuildingProject=false;$(SlnGenGlobalProperties)</SlnGenGlobalProperties>
     <SlnGenGlobalProperties Condition=" '$(SlnGenGlobalProperties)' == '' ">DesignTimeBuild=true;BuildingProject=false</SlnGenGlobalProperties>
-
   </PropertyGroup>
 
   <Target Name="SlnGen"