From 688f6cb65978f3e3b19ce76633a7c5d5945c8a50 Mon Sep 17 00:00:00 2001
From: jtalborough <jalborough@pepperdash.com>
Date: Mon, 6 May 2024 15:14:38 -0400
Subject: [PATCH] style: Improve file paths and package output in docker
 workflow

---
 .github/workflows/docker.yml                           | 8 +-------
 src/PepperDash.Essentials/PepperDash.Essentials.csproj | 6 +++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 61f1cccd..ed60a042 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -65,19 +65,13 @@ jobs:
         run: nuget restore .\$($Env:SOLUTION_FILE).sln
       # Build the solutions in the docker image
       - name: Build Solution        
-        run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" -m
+        run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" /p:PackageOutputPath=".\output" -m        
       - name: Create tag for non-rc builds
         if: contains(steps.setVersion.outputs.version, 'alpha')
         run: |
           git tag ${{ steps.setVersion.outputs.version }}
           git push --tags origin
       # Create the release on the source repo
-      - name: Install 7-Zip
-        run: choco install 7zip.install -y
-      - name: Add CPZ and CPLZ to NuGet Package
-        run: |
-          7z a .\output\PepperDash.Essentials.${{ steps.setVersion.outputs.version }}.nupkg .\output\**\*.cpz..\builds
-          7z a .\output\PepperDash.Essentials.${{ steps.setVersion.outputs.version }}.nupkg .\output\**\*.cplz..\builds
       - name: Create Release
         id: create_release
 #        if: contains(steps.setVersion.outputs.version,'-rc-') ||
diff --git a/src/PepperDash.Essentials/PepperDash.Essentials.csproj b/src/PepperDash.Essentials/PepperDash.Essentials.csproj
index 188b115c..1a310ba6 100644
--- a/src/PepperDash.Essentials/PepperDash.Essentials.csproj
+++ b/src/PepperDash.Essentials/PepperDash.Essentials.csproj
@@ -23,10 +23,10 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <None Include=".\PepperDashEssentials\bin\*.cpz">
+    <Content Include="output\**\*.cpz">
       <Pack>true</Pack>
-      <PackagePath>lib/{tfm}</PackagePath>
-    </None>
+      <PackagePath>content\</PackagePath>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.20.42" />