fix1

Author: Merrick Zhang

.github/workflows/build-and-release.yml

@@ -27,50 +27,20 @@ jobs:
 
     - name: Build project
       run: |
-        $outDir = "build/bin/${{ matrix.configuration }}/${{ matrix.platform }}"
-        msbuild build/VisualStudio/Notepad4.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} /p:OutDir=$outDir\ /verbosity:minimal
-        msbuild locale/Locale.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} /p:OutDir=$outDir\ /verbosity:minimal
+        msbuild build/VisualStudio/Notepad4.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} /verbosity:minimal
+        msbuild locale/Locale.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} /verbosity:minimal
 
     - name: Debug - List directory structure after build
       run: |
-        Get-ChildItem -Path "." -Recurse -File | Where-Object { $_.Name -match "\.exe$" } | Select-Object FullName
-
-    - name: Create output directory
-      run: |
-        New-Item -ItemType Directory -Path "output/${{ matrix.platform }}" -Force
-
-    - name: Copy built files
-      run: |
-        # Use the exact output directory we specified in msbuild
-        $srcDir = "build/bin/${{ matrix.configuration }}/${{ matrix.platform }}"
-        $destDir = "output/${{ matrix.platform }}"
-        
-        if (Test-Path "$srcDir\Notepad4.exe") {
-          Write-Host "Found Notepad4.exe in: $srcDir"
-          Copy-Item -Path "$srcDir\Notepad4.exe" -Destination "$destDir"
-          Copy-Item -Path "$srcDir\matepath.exe" -Destination "$destDir"
-          # Also copy locale folder if it exists
-          if (Test-Path "$srcDir\locale") {
-            Copy-Item -Path "$srcDir\locale" -Destination "$destDir" -Recurse
-          }
-        } else {
-          Write-Error "Could not find Notepad4.exe in $srcDir"
-          # List directory structure for debugging
-          Get-ChildItem -Path "." -Recurse -File | Where-Object { $_.Name -match "\.exe$" } | Select-Object FullName
-          exit 1
-        }
-
-    - name: Debug - List output directory contents
-      run: |
-        Get-ChildItem -Path "output/${{ matrix.platform }}" -Recurse -File | Select-Object FullName
+        Get-ChildItem -Path "./build" -Recurse -File | Where-Object { $_.Name -match "\.exe$" } | Select-Object FullName
 
     - name: Build NSIS installer
       run: |
         $platform = "${{ matrix.platform }}"
-        $arch = if ($platform -eq "Win32") { "x86" } elseif ($platform -eq "x64") { "x64" } else { "arm64" }
+        $arch = $platform
         $version = if ("${{ github.ref }}" -like "refs/tags/*") { "${{ github.ref_name }}" } else { "dev" }
-        $outputFile = "output\Notepad4-${version}-${arch}.exe"
-        $sourceDir = "output\${platform}"
+        $outputFile = "Notepad4-${version}-${arch}.exe"
+        $sourceDir = "build\bin\Release\${platform}"
         
         makensis /DVERSION="$version" /DARCH="$arch" /DOUTPUT_FILE="$outputFile" /DSOURCE_DIR="$sourceDir" build\Notepad4.nsi