From 64c86ca321240eaf2c92a2aef1db81a2b5a5ce2b Mon Sep 17 00:00:00 2001
From: wwwDayDream <13383838+wwwDayDream@users.noreply.github.com>
Date: Mon, 23 Sep 2024 02:57:25 -0500
Subject: [PATCH] Updating common

---
 MSBuild/Common.targets         |  5 +++--
 MSBuild/Packaging.TCLI.targets | 14 ++------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/MSBuild/Common.targets b/MSBuild/Common.targets
index 04a8013..758f278 100644
--- a/MSBuild/Common.targets
+++ b/MSBuild/Common.targets
@@ -1,4 +1,4 @@
-<Project InitialTargets="IncludeMinVer" DefaultTargets="SetupMinVer">
+<Project InitialTargets="IncludeMinVer">
     <PropertyGroup>
         <AssemblyName>wwwDayDream.$(MSBuildProjectName)</AssemblyName>
         <Product>$(MSBuildProjectName)</Product>
@@ -27,11 +27,12 @@
             <PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="all"/>
         </ItemGroup>
     </Target>
-    <Target Name="SetupMinVer" DependsOnTargets="MinVer">
+    <Target Name="SetupMinVer" AfterTargets="MinVer">
         <PropertyGroup>
             <AssemblyVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</AssemblyVersion>
             <PlainVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)</PlainVersion>
             <BepInExPluginVersion>$(PlainVersion)</BepInExPluginVersion>
+            <PackageVersion>$(PlainVersion)</PackageVersion>
         </PropertyGroup>
     </Target>
 </Project>
\ No newline at end of file
diff --git a/MSBuild/Packaging.TCLI.targets b/MSBuild/Packaging.TCLI.targets
index 3d5b946..f7ddc7c 100644
--- a/MSBuild/Packaging.TCLI.targets
+++ b/MSBuild/Packaging.TCLI.targets
@@ -61,14 +61,12 @@
         </ItemGroup>
         <PropertyGroup>
             <PackageDescription Condition="'$(PackageDescription)' == 'Package Description'">%(PackageReadmeNoHashFileLines.Identity)</PackageDescription>
-
-            <NupkgOutputPath>$([System.IO.Path]::GetFullPath('$(MSBuildProjectPath)$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg'))</NupkgOutputPath>
-            <TCLIOutputPath>$([System.IO.Path]::GetFullPath('$(MSBuildProjectPath)$(PackageOutputPath)$(PackageAuthor)-$(PackageId)-$(PackageVersion).zip'))</TCLIOutputPath>
         </PropertyGroup>
     </Target>
 
     <Target Name="AfterBuildPackaging" AfterTargets="Build" BeforeTargets="GenerateNuspec">
         <PropertyGroup>
+            <PackagesOutputPath>$([System.IO.Path]::GetFullPath('$(MSBuildProjectPath)$(PackageOutputPath)'))</PackagesOutputPath>
             <NupkgOutputPath>$([System.IO.Path]::GetFullPath('$(MSBuildProjectPath)$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg'))</NupkgOutputPath>
             <TCLIOutputPath>$([System.IO.Path]::GetFullPath('$(MSBuildProjectPath)$(PackageOutputPath)$(PackageAuthor)-$(PackageId)-$(PackageVersion).zip'))</TCLIOutputPath>
         </PropertyGroup>
@@ -134,14 +132,6 @@
     </Target>
 
     <Target Name="PostPackFileWrites" AfterTargets="GenerateNuspec">
-        <ItemGroup>
-            <Packages Condition="Exists($(NupkgOutputPath))" Include="NUPKG=$(NupkgOutputPath)"/>
-            <Packages Condition="Exists($(TCLIOutputPath))" Include="TSPKG=$(TCLIOutputPath)"/>
-        </ItemGroup>
-        <PropertyGroup>
-            <FinalOutput Condition="'@(Packages->Count())' == '0'">-1</FinalOutput>
-            <FinalOutput Condition="'@(Packages->Count())' > '0'">@(Packages)</FinalOutput>
-        </PropertyGroup>
-        <Message Importance="high" Text="$(FinalOutput)"/>
+        <Message Importance="high" Text="$(PackagesOutputPath)"/>
     </Target>
 </Project>
\ No newline at end of file