diff options
| author | Tiago Conceição <Tiago_caza@hotmail.com> | 2021-01-07 08:02:13 +0300 |
|---|---|---|
| committer | Tiago Conceição <Tiago_caza@hotmail.com> | 2021-01-07 08:02:13 +0300 |
| commit | 703960a0603cbcca88c570877850569abd955eba (patch) | |
| tree | 977432c034457e632fb077cedbc4532acff2b409 /UVtools.Installer | |
| parent | b36dce28a66472f5f1a4538b36de5f4d0f465447 (diff) | |
v2.1.3v2.1.3
* (Add) PrusaSlicer printers:
* Peopoly Phenom XXL
* QIDI 3D ibox mono
* Wanhao CGR Mini Mono
* Wanhao CGR Mono
* (Add) PrusaSlicer light supports profiles
* (Add) Calibration - Elephant Foot: Mirror output
* (Add) Calibration - XYZ Accuracy: Mirror output
* (Add) Calibration - Tolerance: Mirror output
* (Add) Calibration - Grayscale: Mirror output
* (Add) Scripts on github
* (Change) Save 'Display Width' and 'Height' to calibration profiles and load them back only if file format aware from these properties
* (Fix) Tool - Morph: Set a rectangular 3x3 kernel by default
* (Fix) Tool - Blur: Set a rectangular 3x3 kernel by default
* (Fix) Calibration - Elephant Foot: Include part scale on profile text
* (Fix) MSI dont store instalation path (#121)
Diffstat (limited to 'UVtools.Installer')
| -rw-r--r-- | UVtools.Installer/Code/Features.wxs | 10 | ||||
| -rw-r--r-- | UVtools.Installer/Code/Product.wxs | 20 |
2 files changed, 28 insertions, 2 deletions
diff --git a/UVtools.Installer/Code/Features.wxs b/UVtools.Installer/Code/Features.wxs index a0c923f..820a881 100644 --- a/UVtools.Installer/Code/Features.wxs +++ b/UVtools.Installer/Code/Features.wxs @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> + <Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="ProgramFilesFolder"> <Directory Id="INSTALLLOCATION" Name="UVtools"> @@ -8,7 +9,16 @@ </Directory> </Directory> </Directory> + + <Property Id="INSTALLDIR"> + <RegistrySearch Id="INSTALLDIRRegistry" Type="raw" Root="HKCU" Key="Software\UVtools" Name="InstallDir" /> + </Property> + + <SetDirectory Id="INSTALLLOCATION" Value="[INSTALLDIR]">INSTALLDIR</SetDirectory> + + <Feature Id="UVtools" Title="UVtools" Description="Installs all the files needed for UVtools" Level="1" AllowAdvertise="no" ConfigurableDirectory="INSTALLLOCATION"> + <ComponentRef Id="RegistryEntries" /> <MergeRef Id="UVtools" /> <!-- Uncomment the below line to pull in IIS Metadata. Otherwise delete if not needed --> <!--<ComponentGroupRef Id="webSite" />--> diff --git a/UVtools.Installer/Code/Product.wxs b/UVtools.Installer/Code/Product.wxs index 1dcdb80..9a0b9fb 100644 --- a/UVtools.Installer/Code/Product.wxs +++ b/UVtools.Installer/Code/Product.wxs @@ -21,13 +21,29 @@ Schedule="afterInstallInitialize" /> <!--Common Launch Condition--> <!-- Examples at http://wixtoolset.org/documentation/manual/v3/customactions/wixnetfxextension.html --> + <!-- <PropertyRef Id="NETFRAMEWORK45" /> <Condition Message="[ProductName] requires .NET Framework 4.8.">Installed OR NETFRAMEWORK45</Condition> + --> <!-- Include User Interface Experience --> - <Icon Id="Icon.ico" SourceFile="..\UVtools.WPF\UVtools.ico" /> + <Icon Id="Icon.ico" SourceFile="..\UVtools.CAD\UVtools.ico" /> <Property Id="ARPPRODUCTICON" Value="Icon.ico"></Property> <UIRef Id="UI" /> <!-- Include Features and Directories Fragment --> - <DirectoryRef Id="INSTALLLOCATION" /> + <DirectoryRef Id="INSTALLLOCATION"> + <Component Id="RegistryEntries" Guid="C3603223-A8C1-4393-8C06-36B48DED2652"> + <RegistryKey + Root="HKCU" + Key="Software\UVtools" + ForceCreateOnInstall="yes" + ForceDeleteOnUninstall="yes" /> + <RegistryValue + Root="HKCU" + Key="Software\UVtools" + Name="InstallDir" + Type="string" + Value="[INSTALLLOCATION]" /> + </Component> + </DirectoryRef> </Product> </Wix>
\ No newline at end of file |