try fix installer

insomniachi · Jan 30, 2024 · ceabb73 · ceabb73
1 parent 80d008f
commit ceabb73
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml
@@ -32,7 +32,7 @@ jobs:
             uses: battila7/get-version-action@v2
 
         -   name: 'Build Project'
-            run: dotnet publish ${{ env.MAIN_PROJECT_PATH }} --self-contained -c Release -r win10-x64 -o ${{ env.PUBLISH_FOLDER }} /property:BuildVersion=${{ steps.version.outputs.version-without-v }}
+            run: dotnet publish ${{ env.MAIN_PROJECT_PATH }} --self-contained -c Release -r win10-x64 -o ${{ env.PUBLISH_FOLDER }}\ /property:BuildVersion=${{ steps.version.outputs.version-without-v }}
 
         -   name: 'Copy FFMPEG'
             run: xcopy ${{ env.FFMPEG_PATH }} ${{ env.PUBLISH_FOLDER }}\FFmpeg\ /s /e /h
@@ -50,7 +50,7 @@ jobs:
                 ClientIdSimkl: ${{ secrets.SIMKL_CLIENT_ID }}
 
         -   name: 'Build Installer'
-            run: msbuild ${{ env.INSTALLER_PATH }} /property:Configuration=Release /property:BuildVersion=${{ steps.version.outputs.version-without-v }}
+            run: msbuild ${{ env.INSTALLER_PATH }} /property:Configuration=Release /property:BuildVersion=${{ steps.version.outputs.version-without-v }} /property:BasePath=${{ env.PUBLISH_FOLDER }}
 
         -   name: 'Create Release'
             id: create_release

diff --git a/Totoro.Installer/Totoro.Installer.wixproj b/Totoro.Installer/Totoro.Installer.wixproj
@@ -66,7 +66,6 @@
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
   <Target Name="BeforeBuild">
-    <Exec Command="rd /s /q ..\Totoro.WinUI\bin\publish\" />
     <PropertyGroup>
       <DefineConstants>BuildVersion=$(Version);BasePath=..\Totoro.WinUI\bin\publish\</DefineConstants>
     </PropertyGroup>