Fix tasks.

ikvmnet · Aug 31, 2023 · 7a9f74b · 7a9f74b
1 parent 112d4c5
commit 7a9f74b
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/IKVM.Core.MSBuild/IKVM.Core.MSBuild.csproj b/src/IKVM.Core.MSBuild/IKVM.Core.MSBuild.csproj
@@ -21,26 +21,25 @@
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
     </ItemGroup>
 
-    <ItemGroup>
-        <Content Include="build\**\*" PackagePath="build\%(RecursiveDir)%(Filename)%(Extension)" />
-        <Content Include="buildMultiTargeting\**\*" PackagePath="buildMultiTargeting\%(RecursiveDir)%(Filename)%(Extension)" />
-        <Content Include="targets\**\*" PackagePath="targets\%(RecursiveDir)%(Filename)%(Extension)" />
-        <Content Include="lib\**\*" PackagePath="lib\%(RecursiveDir)%(Filename)%(Extension)" />
-    </ItemGroup>
-
     <ItemGroup>
         <None Include="..\..\LICENSE.md" Pack="true" PackagePath="." />
         <None Include="..\..\README.md" Pack="true" PackagePath="." />
+        <None Include="build\**\*" Pack="true" PackagePath="build\%(RecursiveDir)%(Filename)%(Extension)" />
+        <None Include="buildMultiTargeting\**\*" Pack="true" PackagePath="buildMultiTargeting\%(RecursiveDir)%(Filename)%(Extension)" />
+        <None Include="targets\**\*" Pack="true" PackagePath="targets\%(RecursiveDir)%(Filename)%(Extension)" />
+        <None Include="lib\**\*" Pack="true" PackagePath="lib\%(RecursiveDir)%(Filename)%(Extension)" />
     </ItemGroup>
 
-    <ItemGroup Condition=" '$(TargetFramework)' == '' ">
+    <ItemGroup>
         <PublishProjectReference Include="..\IKVM.Core.MSBuild.Tasks\IKVM.Core.MSBuild.Tasks.csproj">
             <SetTargetFramework>TargetFramework=net472</SetTargetFramework>
-            <ProjectPackagePath>tasks\net472</ProjectPackagePath>
+            <PublishPackagePath>tasks\net472</PublishPackagePath>
+            <Pack>true</Pack>
         </PublishProjectReference>
         <PublishProjectReference Include="..\IKVM.Core.MSBuild.Tasks\IKVM.Core.MSBuild.Tasks.csproj">
             <SetTargetFramework>TargetFramework=netcoreapp3.1</SetTargetFramework>
-            <ProjectPackagePath>tasks\netcoreapp3.1</ProjectPackagePath>
+            <PublishPackagePath>tasks\netcoreapp3.1</PublishPackagePath>
+            <Pack>true</Pack>
         </PublishProjectReference>
     </ItemGroup>