From f926db418d34c07ece6145d88ae4cde3dc5aacef Mon Sep 17 00:00:00 2001
From: jtalborough <jtalborough@gmail.com>
Date: Thu, 27 Feb 2025 18:46:59 -0500
Subject: [PATCH] feat: improve CPZ file handling in Docker workflow and update
 build targets for better output management

---
 .github/workflows/docker.yml | 44 ++++++++++++++++++++++++------------
 src/Directory.Build.targets  | 15 ++++++++++--
 2 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ed5fcec2..a5b42a54 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -70,20 +70,36 @@ jobs:
         shell: powershell
         run: |
           Write-Host "Checking for CPZ files..."
-          $targetDir = ".\$($Env:SOLUTION_FILE)\bin\$($Env:BUILD_TYPE)\net472\"
-          $outputDir = ".\output\"
-          
-          Write-Host "Files in target directory:"
-          Get-ChildItem -Path $targetDir -Recurse | Where-Object { $_.Extension -eq ".cpz" } | ForEach-Object { Write-Host $_.FullName }
-          
-          Write-Host "Files in output directory:"
-          Get-ChildItem -Path $outputDir -Recurse | Where-Object { $_.Extension -eq ".cpz" } | ForEach-Object { Write-Host $_.FullName }
-          
-          # Copy CPZ files to output if they exist but weren't copied
-          Get-ChildItem -Path $targetDir -Recurse | Where-Object { $_.Extension -eq ".cpz" } | ForEach-Object {
-            $destPath = Join-Path $outputDir "$($Env:SOLUTION_FILE)\$($_.Name)"
-            Write-Host "Copying $($_.FullName) to $destPath"
-            Copy-Item -Path $_.FullName -Destination $destPath -Force
+
+          # First, let's find out the actual directory structure
+          Write-Host "Current directory: $(Get-Location)"
+          Write-Host "Directory structure:"
+          Get-ChildItem -Path . -Directory -Recurse -Depth 2 | ForEach-Object { Write-Host $_.FullName }
+
+          # Look for all CPZ files in the repository
+          Write-Host "Searching for all CPZ files in the repository:"
+          $cpzFiles = Get-ChildItem -Path . -Recurse -Filter "*.cpz"
+          if ($cpzFiles.Count -eq 0) {
+              Write-Host "No CPZ files found in the repository."
+          } else {
+              Write-Host "Found $($cpzFiles.Count) CPZ files:"
+              foreach ($file in $cpzFiles) {
+                  Write-Host "  $($file.FullName)"
+              }
+              
+              # Create output directory if it doesn't exist
+              $outputDir = ".\output\build"
+              if (-not (Test-Path $outputDir)) {
+                  New-Item -ItemType Directory -Path $outputDir -Force
+                  Write-Host "Created output directory: $outputDir"
+              }
+              
+              # Copy all CPZ files to the output directory
+              foreach ($file in $cpzFiles) {
+                  $destPath = Join-Path $outputDir $file.Name
+                  Write-Host "Copying $($file.FullName) to $destPath"
+                  Copy-Item -Path $file.FullName -Destination $destPath -Force
+              }
           }
       - name: Pack Solution
         run: |
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 14a864cc..d95e1dc2 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -1,11 +1,20 @@
+<Project>
 <Project>
   <ItemGroup>
-    <!-- Ensure we're looking in all possible locations for CPZ files -->
+    <!-- Include CPZ files from multiple possible locations -->
     <None Include="$(TargetDir)*.cpz" Condition="$(ProjectType) == 'Program'">
       <Pack>true</Pack>
       <PackagePath>build;</PackagePath>
     </None>
-    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cpz" Condition="$(ProjectType) == 'Program'">
+    <None Include="$(OutputPath)*.cpz" Condition="$(ProjectType) == 'Program'">
+      <Pack>true</Pack>
+      <PackagePath>build;</PackagePath>
+    </None>
+    <None Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\**\*.cpz" Condition="$(ProjectType) == 'Program'">
+      <Pack>true</Pack>
+      <PackagePath>build;</PackagePath>
+    </None>
+    <None Include="$(PackageOutputPath)\build\*.cpz" Condition="$(ProjectType) == 'Program'">
       <Pack>true</Pack>
       <PackagePath>build;</PackagePath>
     </None>
@@ -14,6 +23,8 @@
       <PackagePath>build;</PackagePath>
     </None>
   </ItemGroup>
+  <!-- Rest of your targets remain the same -->
+</Project>
   <Target Name="Create CPLZ" AfterTargets="Build; AfterRebuild" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''">
     <Message Text="Creating CPLZ $(TargetDir)" Importance="high" />
     <Message Text="PackageOutputPath: $(PackageOutputPath)" Importance="high" />