From 05bee43d851a4713e5397c50c33ffde63db6d5fe Mon Sep 17 00:00:00 2001
From: Andrew Welker <awelker@pepperdash.com>
Date: Mon, 5 Feb 2024 10:41:36 -0600
Subject: [PATCH] build: actually get everything building correctly

---
 .github/workflows/docker.yml |  2 +-
 .github/workflows/main.yml   |  2 +-
 src/Directory.Build.props    | 10 ++++++++
 src/Directory.Build.targets  | 50 +++++++++++++++++++++++-------------
 4 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7fe106d3..8646551a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -79,7 +79,7 @@ jobs:
 #            contains(steps.setVersion.outputs.version, '-beta-')
         uses: ncipollo/release-action@v1
         with:
-          artifacts: 'output\**\*.*(cpz|cplz)'
+          artifacts: 'output\**\*.*(cpz|cplz|nupkg)'
           generateReleaseNotes: true
           prerelease: ${{contains('debug', env.BUILD_TYPE)}}
           tag: ${{ steps.setVersion.outputs.version }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index babd2651..f049d34d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,7 +42,7 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           updateRelease: true
-          artifacts: 'output\**\*.*(cpz|cplz)'          
+          artifacts: 'output\**\*.*(cpz|cplz|nupkg)'          
           tag: ${{ steps.setVersion.outputs.version }}
       - name: Setup Nuget
         run: | 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 698a159f..6e495680 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -17,4 +17,14 @@
     <None Include="..\..\LICENSE.md" Pack="true" PackagePath=""/>
     <None Include="..\..\README.md" Pack="true" PackagePath=""/>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(OutputPath)\**\*.cpz" Condition="$(ProjectType) == 'Program'">
+      <Pack>true</Pack>
+      <PackagePath>build;</PackagePath>
+    </None>
+    <None Include="$(OutputPath)\**\*.cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
+      <Pack>true</Pack>
+      <PackagePath>build;</PackagePath>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 83bbc930..716710ae 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -1,26 +1,40 @@
 <Project>
-  <ItemGroup>
-    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cpz" Condition="$(ProjectType) == 'Program'">
-      <Pack>true</Pack>
-      <PackagePath>build;</PackagePath>
-    </None>
-    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
-      <Pack>true</Pack>
-      <PackagePath>build;</PackagePath>
-    </None>
-  </ItemGroup>
   <Target Name="Create CPLZ" AfterTargets="Build; AfterRebuild" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''">
     <Message Text="Creating CPLZ $(TargetDir)"></Message>
-    <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))" />
-    <MakeDir Directories="$(PackageOutputPath)\$(AssemblyName)" Condition="!Exists('$(PackageOutputPath)\$(AssemblyName)')" />
-    <ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cplz" Overwrite="true"/>    
+    <ItemGroup>
+      <FilesToDelete Include="$(TargetDir)*.cplz" />
+    </ItemGroup>
+    <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))"/>
+    <Delete Files="@(FilesToDelete)" />
+    <ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(AssemblyName).$(Version).$(TargetFramework).cplz" Overwrite="true"/>
+    <Copy SourceFiles="$(PackageOutputPath)\$(AssemblyName).$(Version).$(TargetFramework).cplz" DestinationFiles="$(OutputPath)\$(AssemblyName).$(Version).$(TargetFramework).cplz" />
   </Target>
-  <Target Name="Copy CPZ NET6" AfterTargets="SimplSharpPostProcess" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' == 'net6.0' ) Or ( '$(TargetFramework)' == 'net8.0' ))">
-    <Message Text="Copying CPZ"></Message>
-    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cpz" />
+  <Target Name="Delete Old CPZ" BeforeTargets="BeforeBuild" Condition="$(ProjectType) == 'Program'">
+    <ItemGroup>
+      <FilesToDelete Include="$(TargetDir)*.cpz" />
+    </ItemGroup>
+    <Delete Files="@(FilesToDelete)" />
   </Target>
-  <Target Name="Copy CPZ NET47" AfterTargets="SimplSharpPostProcess47" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' != 'net6.0' ) And ( '$(TargetFramework)' != 'net8.0' ))">
+  <Target Name="Move CPZ NET6" AfterTargets="SimplSharpPostProcess" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' == 'net6.0' ) Or ( '$(TargetFramework)' == 'net8.0' ))">
     <Message Text="Copying CPZ"></Message>
-    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cpz" />
+    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" />
+    <Copy SourceFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" DestinationFiles="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cpz" />
+  </Target>
+  <Target Name="Move CPZ NET47" AfterTargets="SimplSharpPostProcess47" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' != 'net6.0' ) And ( '$(TargetFramework)' != 'net8.0' ))">
+    <Message Text="Copying CPZ"></Message>
+    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" />
+    <Copy SourceFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" DestinationFiles="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cpz" />
+  </Target>
+  <Target Name="Include Crestron Zips" BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <None Include="$(OutputPath)\**\*.cpz" Condition="$(ProjectType) == 'Program'">
+        <Pack>true</Pack>
+        <PackagePath>build;</PackagePath>
+      </None>
+      <None Include="$(OutputPath)\**\*.cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
+        <Pack>true</Pack>
+        <PackagePath>build;</PackagePath>
+      </None>
+    </ItemGroup>
   </Target>
 </Project>