installer changes

insomniachi · Aug 12, 2022 · 53c6978 · 53c6978
1 parent 5e10e61
commit 53c6978
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/AnimDL.Installer/AnimDL.Installer.wixproj b/AnimDL.Installer/AnimDL.Installer.wixproj
@@ -66,16 +66,16 @@
     <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 ..\AnimDL.WinUI\bin\x64\Release\net6.0-windows10.0.19041.0\win10-x64\" />
-    <Exec Command="dotnet publish ..\AnimDL.WinUI\AnimDL.WinUI.csproj -c $(Configuration) --self-contained -r win10-x64" />
+    <Exec Command="rd /s /q ..\AnimDL.WinUI\bin\publish\" />
     <PropertyGroup>
-      <DefineConstants>BuildVersion=$(Version);BasePath=..\AnimDL.WinUI\bin\x64\Release\net6.0-windows10.0.19041.0\win10-x64\publish\</DefineConstants>
+      <DefineConstants>BuildVersion=$(Version);BasePath=..\AnimDL.WinUI\bin\publish\</DefineConstants>
     </PropertyGroup>
+	<Exec Command="dotnet publish ..\AnimDL.WinUI\AnimDL.WinUI.csproj -c $(Configuration) --self-contained -r win10-x64 -o ..\AnimDL.WinUI\bin\publish\ /property:BuildVersion=$(BuildVersion)" />
     <HeatDirectory OutputFile="ComponentsGenerated.wxs"
 				   DirectoryRefId="INSTALLFOLDER"
 				   ComponentGroupName="PublishedComponents" 
 				   SuppressCom="true" 
-				   Directory="..\AnimDL.WinUI\bin\x64\Release\net6.0-windows10.0.19041.0\win10-x64\publish\" 
+				   Directory="..\AnimDL.WinUI\bin\publish\" 
 				   SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" AutoGenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" RunAsSeparateProcess="$(RunWixToolsOutOfProc)" 
 				   PreprocessorVariable="var.BasePath"/>
   </Target>

diff --git a/AnimDL.WinUI/AnimDL.WinUI.csproj b/AnimDL.WinUI/AnimDL.WinUI.csproj
@@ -12,7 +12,8 @@
 		<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
 		<EnableMsixTooling>true</EnableMsixTooling>
 		<ApplicationIcon>Assets\WindowIcon.ico</ApplicationIcon>
-		<Version>0.0.1.0</Version>
+		<Version Condition=" '$(BuildVersion)' == '' ">1.0.0.0</Version>
+		<Version Condition=" '$(BuildVersion)' != '' ">$(BuildVersion)</Version>
 	</PropertyGroup>
 
 	<ItemGroup>