From a4de388e342fe0a6a410d300bba3dcec2b956b33 Mon Sep 17 00:00:00 2001
From: Popax21 <popa21@popa21.at>
Date: Mon, 22 Apr 2024 03:09:59 +0200
Subject: [PATCH] Fix NuGet MSBuild project (finally)

---
 .github/workflows/build-nuget.yml |  2 +-
 Piton.NuGet.proj                  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-nuget.yml b/.github/workflows/build-nuget.yml
index ad2ffbd..83fba65 100644
--- a/.github/workflows/build-nuget.yml
+++ b/.github/workflows/build-nuget.yml
@@ -71,7 +71,7 @@ jobs:
           merge-multiple: true
 
       - name: Pack NuGet package
-        run: dotnet msbuild -p:TreatWarningsAsErrors=true -p:PitonAppHostBinDir=apphost-bin -p:OutputPath=out Piton.NuGet.proj
+        run: dotnet pack -p:TreatWarningsAsErrors=true -p:PitonAppHostBinDir=apphost-bin --output out Piton.NuGet.proj
 
       - uses: actions/upload-artifact@v4
         with:
diff --git a/Piton.NuGet.proj b/Piton.NuGet.proj
index 5dcaf25..6ed7c57 100644
--- a/Piton.NuGet.proj
+++ b/Piton.NuGet.proj
@@ -16,13 +16,15 @@
     </ItemGroup>
 
     <!-- Build + Include custom MSBuild tasks -->
+    <ItemGroup>
+        <ProjectReference Include="msbuild/Piton.Tasks.csproj" />
+    </ItemGroup>
+
     <Target Name="PackTasksAssembly" BeforeTargets="Build">
-        <!-- Build the MSBuild tasks assembly -->
-        <MSBuild Projects="msbuild/Piton.Tasks.csproj" Properties="Configuration=$(Configuration)">
+        <!-- Include it in the packaged .nupkg -->
+        <MSBuild Projects="msbuild/Piton.Tasks.csproj" Targets="GetTargetPath" Properties="Configuration=$(Configuration)">
             <Output TaskParameter="TargetOutputs" ItemName="PitonTasksAssembly" />
         </MSBuild>
-
-        <!-- Include it in the packaged .nupkg -->
         <ItemGroup>
             <Content Include="@(PitonTasksAssembly)" PackagePath="tasks" />
         </ItemGroup>