From 113fb92594705638349de870eb81fff5472dd4da Mon Sep 17 00:00:00 2001
From: Popax21 <popa21@popa21.at>
Date: Mon, 22 Apr 2024 02:56:02 +0200
Subject: [PATCH] Move NuGet MSBuild project back to top-level

---
 nuget/Piton.NuGet.proj => Piton.NuGet.proj | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
 rename nuget/Piton.NuGet.proj => Piton.NuGet.proj (84%)

diff --git a/nuget/Piton.NuGet.proj b/Piton.NuGet.proj
similarity index 84%
rename from nuget/Piton.NuGet.proj
rename to Piton.NuGet.proj
index e15dbd3..5dcaf25 100644
--- a/nuget/Piton.NuGet.proj
+++ b/Piton.NuGet.proj
@@ -1,6 +1,5 @@
-<Project Sdk="Microsoft.Build.NoTargets/3.7.56">
+<Project Sdk="Microsoft.Build.NoTargets/3.7.56" DefaultTargets="Pack">
     <PropertyGroup>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <NoWarn>NU5100;NU5128;MSB3245</NoWarn> <!-- Disable irrelevant warnings -->
 
         <!-- NuGet metadata -->
@@ -13,13 +12,13 @@
 
     <!-- Include MSBuild .props / .target files -->
     <ItemGroup>
-        <Content Include="../build/" PackagePath="build/" />
+        <Content Include="build/" PackagePath="build/" />
     </ItemGroup>
 
     <!-- Build + Include custom MSBuild tasks -->
-    <Target Name="PackTasksAssembly" BeforeTargets="Pack">
+    <Target Name="PackTasksAssembly" BeforeTargets="Build">
         <!-- Build the MSBuild tasks assembly -->
-        <MSBuild Projects="../msbuild/Piton.Tasks.csproj" Properties="Configuration=$(Configuration)">
+        <MSBuild Projects="msbuild/Piton.Tasks.csproj" Properties="Configuration=$(Configuration)">
             <Output TaskParameter="TargetOutputs" ItemName="PitonTasksAssembly" />
         </MSBuild>
 
@@ -55,7 +54,7 @@
             />
             <_PitonAppHostBin Include="@(_PitonAppHostBinRaw->Exists())" />
         </ItemGroup>
-        <Error Text="No apphost binaries present in PitonAppHostBinDir '$(PitonAppHostBinDir)'!" Condition="@(_PitonAppHostBin->Count()) == 0" />
+        <!-- <Error Text="No apphost binaries present in PitonAppHostBinDir '$(PitonAppHostBinDir)'!" Condition="@(_PitonAppHostBin->Count()) == 0" /> -->
 
         <!-- Include them in the packaged .nupkg -->
         <ItemGroup>