Skip to content

Commit 066a08e

Browse files
LirynaLiryna
committed
Installer - Regenerate all GUID to fix uninstall and conflict with v1
Fixes #1070
1 parent 0b4cb6c commit 066a08e

File tree

3 files changed

+40
-40
lines changed

3 files changed

+40
-40
lines changed

‎dokan_wix/Dokan_x64.wxs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<Directory Id="ProgramFiles64Folder">
146146
<Directory Id="DOKANDIR" Name="Dokan">
147147
<Directory Id="INSTALLDIR" Name="DokanLibrary-$(var.BaseVersion)">
148-
<Component Id="ProgramFilesComponent" Win64="yes" Guid="{EBBC0221-B7A4-4AE5-91AB-7DDB3C90FE31}">
148+
<Component Id="ProgramFilesComponent" Win64="yes" Guid="{C2C81F15-C46C-4CE3-97BB-B782CB1E571C}">
149149
<Environment Id="DokanLibraryEnvPath" Name="DokanLibrary$(var.MajorVersion)" Value="[INSTALLDIR]" Permanent="no" Part="all" Action="set" System="yes" />
150150
<RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(var.ProductCodeX64)" >
151151
<RegistryValue Type="string" Name="AppLocation" Value="[INSTALLDIR]" KeyPath="no" />
@@ -161,32 +161,32 @@
161161
<File Id="licensemitTXT" Source="..\license.mit.txt" Name="license.mit.txt" KeyPath="no"/>
162162
<RemoveFolder Id="RemoveINSTALLDIR" On="uninstall" />
163163
</Component>
164-
<Component Id="SysPDBFiles" Guid="{D88F93D7-C6AA-4476-ABF0-1C3273303F08}">
164+
<Component Id="SysPDBFiles" Guid="{13A9BCAF-229C-468B-A48D-237A4147B823}">
165165
<File Id="DokanPDB" Source="..\x64\$(var.Configuration)\dokan$(var.MajorVersion).pdb" Name="dokan$(var.MajorVersion).pdb" KeyPath="yes"/>
166166
<File Id="DokanfusePDB" Source="..\x64\$(var.Configuration)\dokanfuse$(var.MajorVersion).pdb" Name="dokanfuse$(var.MajorVersion).pdb" KeyPath="no"/>
167167
<File Id="DokannpPDB" Source="..\x64\$(var.Configuration)\dokannp$(var.MajorVersion).pdb" Name="dokannp$(var.MajorVersion).pdb" KeyPath="no"/>
168168
</Component>
169169
<Directory Id="LIBDIR" Name="lib">
170-
<Component Id="LibFilesComponent" Win64="yes" Guid="{777220E2-B13C-495B-9B58-936A2810DEEB}">
170+
<Component Id="LibFilesComponent" Win64="yes" Guid="{953AC0EA-3436-4FBD-8B9E-5960F09CEC34}">
171171
<Environment Id="DokanLibraryLibx64EnvPath" Name="DokanLibrary$(var.MajorVersion)_LibraryPath_x64" Value="[LIBDIR]" Permanent="no" Part="all" Action="set" System="yes" />
172172
<File Id="dokanLIB" Source="..\x64\$(var.Configuration)\dokan$(var.MajorVersion).lib" Name="dokan$(var.MajorVersion).lib" KeyPath="yes"/>
173173
<File Id="dokanfuseLIB" Source="..\x64\$(var.Configuration)\dokanfuse$(var.MajorVersion).lib" Name="dokanfuse$(var.MajorVersion).lib" KeyPath="no"/>
174174
<File Id="dokannpLIB" Source="..\x64\$(var.Configuration)\dokannp$(var.MajorVersion).lib" Name="dokannp$(var.MajorVersion).lib" KeyPath="no"/>
175175
</Component>
176176
</Directory>
177177
<Directory Id="X86PROGRAMSDIR" Name="x86">
178-
<Component Id="X86PROGRAMFiles" Guid="{90E88E0C-9009-451F-9AEA-873960C9598C}">
178+
<Component Id="X86PROGRAMFiles" Guid="{06BABF92-9EE8-4968-8D92-2D0835B90863}">
179179
<File Id="X86DokanDLL" Source="..\Win32\$(var.Configuration)\dokan$(var.MajorVersion).dll" Name="dokan$(var.MajorVersion).dll" KeyPath="yes"/>
180180
<File Id="X86DokanFuseDLL" Source="..\Win32\$(var.Configuration)\dokanfuse$(var.MajorVersion).dll" Name="dokanfuse$(var.MajorVersion).dll" KeyPath="no"/>
181181
<File Id="X86dokanctlEXE" Source="..\Win32\$(var.Configuration)\dokanctl.exe" Name="dokanctl.exe" KeyPath="no"/>
182182
</Component>
183-
<Component Id="SysX86PDBFiles" Guid="{3FBAD92A-2AD9-4A9B-98B0-060C8D154188}">
183+
<Component Id="SysX86PDBFiles" Guid="{7C6B60E3-58E1-463C-B070-DC07E2BDE10C}">
184184
<File Id="DokanX86PDB" Source="..\Win32\$(var.Configuration)\dokan$(var.MajorVersion).pdb" Name="dokan$(var.MajorVersion).pdb" KeyPath="yes"/>
185185
<File Id="DokanfuseX86PDB" Source="..\Win32\$(var.Configuration)\dokanfuse$(var.MajorVersion).pdb" Name="dokanfuse$(var.MajorVersion).pdb" KeyPath="no"/>
186186
<File Id="DokannpX86PDB" Source="..\Win32\$(var.Configuration)\dokannp$(var.MajorVersion).pdb" Name="dokannp$(var.MajorVersion).pdb" KeyPath="no"/>
187187
</Component>
188188
<Directory Id="LIBX86DIR" Name="lib">
189-
<Component Id="LibX86FilesComponent" Guid="{89B7DD30-FB5C-43E9-9BFF-9874B4531836}">
189+
<Component Id="LibX86FilesComponent" Guid="{C8EFA823-E8BB-4629-ACC6-0942D56790D2}">
190190
<Environment Id="DokanLibraryLibx86EnvPath" Name="DokanLibrary$(var.MajorVersion)_LibraryPath_x86" Value="[LIBX86DIR]" Permanent="no" Part="all" Action="set" System="yes" />
191191
<File Id="dokanX86LIB" Source="..\Win32\$(var.Configuration)\dokan$(var.MajorVersion).lib" Name="dokan$(var.MajorVersion).lib" KeyPath="yes"/>
192192
<File Id="dokanfuseX86LIB" Source="..\Win32\$(var.Configuration)\dokanfuse$(var.MajorVersion).lib" Name="dokanfuse$(var.MajorVersion).lib" KeyPath="no"/>
@@ -195,15 +195,15 @@
195195
</Directory>
196196
<Directory Id="SAMPLEX86DIR" Name="sample">
197197
<Directory Id="MIRRORX86DIR" Name="mirror">
198-
<Component Id="SampleMirrorFilesComponentX86" Win64="yes" Guid="{B13E60ED-4D42-4919-BDB8-01A08288E894}">
198+
<Component Id="SampleMirrorFilesComponentX86" Win64="yes" Guid="{4C0E105A-9F20-4EF1-AC4E-705524A7155C}">
199199
<File Id="mirrorEXEX86" Source="..\Win32\$(var.Configuration)\mirror.exe" Name="mirror.exe" KeyPath="yes"/>
200200
<File Id="dokanMirrorDLLX86" Source="..\Win32\$(var.Configuration)\dokan$(var.MajorVersion).dll" Name="dokan$(var.MajorVersion).dll" KeyPath="no"/>
201201
<File Id="dokan_mirrorX86vcxproj" Source="..\samples\dokan_mirror\dokan_mirror.vcxproj" Name="dokan_mirror.vcxproj" KeyPath="no"/>
202202
<File Id="mirrorX86C" Source="..\samples\dokan_mirror\mirror.c" Name="mirror.c" KeyPath="no"/>
203203
</Component>
204204
</Directory>
205205
<Directory Id="MEMFSX86DIR" Name="memfs">
206-
<Component Id="SampleMemFSFilesComponentX86" Win64="yes" Guid="{DC0CCB13-16C4-4B6A-A4E4-EF456E22CF10}">
206+
<Component Id="SampleMemFSFilesComponentX86" Win64="yes" Guid="{187EF966-BE78-4F64-93C5-465B673A8929}">
207207
<File Id="memfsX86EXE" Source="..\Win32\$(var.Configuration)\memfs.exe" Name="memfs.exe" KeyPath="yes"/>
208208
<File Id="dokanMemFSX86DLL" Source="..\Win32\$(var.Configuration)\dokan$(var.MajorVersion).dll" Name="dokan$(var.MajorVersion).dll" KeyPath="no"/>
209209
<File Id="dokan_memfsX86vcxproj" Source="..\samples\dokan_memfs\dokan_memfs.vcxproj" Name="dokan_memfs.vcxproj" KeyPath="no"/>
@@ -224,29 +224,29 @@
224224
</Directory>
225225
</Directory>
226226
<Directory Id="DRIVERDIR" Name="driver">
227-
<Component Id="Driver_x64" Guid="{773993A8-BDDF-450B-9F27-3BED9B0DAA52}">
227+
<Component Id="Driver_x64" Guid="{87F2159C-3E84-4629-ACD9-A8EA07C84F6C}">
228228
<File Id="Driver_Sys" Source="..\x64\$(var.Configuration)\Driver\sys\dokan$(var.MajorVersion).sys" Name="dokan$(var.MajorVersion).sys" KeyPath="yes"/>
229229
<File Id="Driver_Cat" Source="..\x64\$(var.Configuration)\Driver\sys\dokan$(var.MajorVersion).cat" Name="dokan$(var.MajorVersion).cat" KeyPath="no"/>
230230
<File Id="Driver_Inf" Source="..\x64\$(var.Configuration)\Driver\sys\dokan.inf" Name="dokan.inf" KeyPath="no"/>
231231
<difx:Driver AddRemovePrograms="no" DeleteFiles="yes" Legacy="yes"/>
232232
</Component>
233-
<Component Id="Driver_x64pdb" Guid="{184A5365-8C4C-4853-A9DA-381C0B12D8D1}">
233+
<Component Id="Driver_x64pdb" Guid="{4BD9696D-0EE6-4305-8FF6-CA5885E62348}">
234234
<File Id="Driver_Syspdb" Source="..\x64\$(var.Configuration)\Driver\dokan$(var.MajorVersion).pdb" Name="dokan$(var.MajorVersion).pdb" KeyPath="yes"/>
235235
</Component>
236236
</Directory>
237237
<Directory Id="INCLUDEDIR" Name="include">
238238
<Directory Id="DOKANINCLUDEDIR" Name="dokan">
239-
<Component Id="IncludeDokanFilesComponent" Win64="yes" Guid="{6D001C3A-F866-40F7-9E16-492766A8A3C7}">
239+
<Component Id="IncludeDokanFilesComponent" Win64="yes" Guid="{7830FCFE-101A-49A9-BF04-DB8FBAC41EFD}">
240240
<File Id="dokanH" Source="..\dokan\dokan.h" Name="dokan.h" KeyPath="yes"/>
241241
<File Id="fileinfoH" Source="..\dokan\fileinfo.h" Name="fileinfo.h" KeyPath="no"/>
242242
<File Id="publicH" Source="..\sys\public.h " Name="public.h" KeyPath="no"/>
243243
</Component>
244244
</Directory>
245-
<Component Id="IncludeFuseCompatFilesComponent" Win64="yes" Guid="{7129AF7C-D5E2-4D3B-B29B-9CBE045F655B}">
245+
<Component Id="IncludeFuseCompatFilesComponent" Win64="yes" Guid="{E9820CFD-7AB8-4953-94E2-76548605A626}">
246246
<File Id="fuse_include_H" Source="..\dokan_fuse\include\old\fuse.h" Name="fuse.h" KeyPath="yes"/>
247247
</Component>
248248
<Directory Id="FUSEINCLUDEDIR" Name="fuse">
249-
<Component Id="IncludeFuseFilesComponent" Win64="yes" Guid="{113F4C52-C272-4346-B65F-E827B8150815}">
249+
<Component Id="IncludeFuseFilesComponent" Win64="yes" Guid="{F483EFF5-700D-44AC-893B-650519BFFBFE}">
250250
<File Id="fuseH" Source="..\dokan_fuse\include\fuse.h" Name="fuse.h" KeyPath="yes"/>
251251
<File Id="fuse_commonH" Source="..\dokan_fuse\include\fuse_common.h" Name="fuse_common.h" KeyPath="no"/>
252252
<File Id="fuse_optH" Source="..\dokan_fuse\include\fuse_opt.h" Name="fuse_opt.h" KeyPath="no"/>
@@ -258,15 +258,15 @@
258258
</Directory>
259259
<Directory Id="SAMPLEDIR" Name="sample">
260260
<Directory Id="MIRRORDIR" Name="mirror">
261-
<Component Id="SampleMirrorFilesComponent" Win64="yes" Guid="{A15F307B-4DA6-4EDA-9AAF-CF86E1B7639E}">
261+
<Component Id="SampleMirrorFilesComponent" Win64="yes" Guid="{F3DF60AD-3A7D-4678-91C9-097E561A8311}">
262262
<File Id="mirrorEXE" Source="..\x64\$(var.Configuration)\mirror.exe" Name="mirror.exe" KeyPath="yes"/>
263263
<File Id="dokanMirrorDLL" Source="..\x64\$(var.Configuration)\dokan$(var.MajorVersion).dll" Name="dokan$(var.MajorVersion).dll" KeyPath="no"/>
264264
<File Id="dokan_mirrorvcxproj" Source="..\samples\dokan_mirror\dokan_mirror.vcxproj" Name="dokan_mirror.vcxproj" KeyPath="no"/>
265265
<File Id="mirrorC" Source="..\samples\dokan_mirror\mirror.c" Name="mirror.c" KeyPath="no"/>
266266
</Component>
267267
</Directory>
268268
<Directory Id="MEMFSDIR" Name="memfs">
269-
<Component Id="SampleMemFSFilesComponent" Win64="yes" Guid="{DF735559-DE20-4FB2-8390-A2EB5F31706E}">
269+
<Component Id="SampleMemFSFilesComponent" Win64="yes" Guid="{F6487723-7E5B-4E8D-889D-C4B0ACEEA43D}">
270270
<File Id="memfsEXE" Source="..\x64\$(var.Configuration)\memfs.exe" Name="memfs.exe" KeyPath="yes"/>
271271
<File Id="dokanMemFSDLL" Source="..\x64\$(var.Configuration)\dokan$(var.MajorVersion).dll" Name="dokan$(var.MajorVersion).dll" KeyPath="no"/>
272272
<File Id="dokan_memfsvcxproj" Source="..\samples\dokan_memfs\dokan_memfs.vcxproj" Name="dokan_memfs.vcxproj" KeyPath="no"/>
@@ -291,14 +291,14 @@
291291

292292
<Directory Id="WindowsFolder" >
293293
<Directory Id="Sys32Folder" Name="System32">
294-
<Component Id="Sys32Files" Guid="{A38A0CC4-3893-43B3-A7B8-8E30207607E4}">
294+
<Component Id="Sys32Files" Guid="{3A47A4F3-45ED-4E73-977B-D09426B5CDED}">
295295
<File Id="DokanSysDLL" Source="..\x64\$(var.Configuration)\dokan$(var.MajorVersion).dll" Name="dokan$(var.MajorVersion).dll" KeyPath="yes"/>
296296
<File Id="DokannpDLL" Source="..\x64\$(var.Configuration)\dokannp$(var.MajorVersion).dll" Name="dokannp$(var.MajorVersion).dll"/>
297297
<File Id="DokanfuseSysDLL" Source="..\x64\$(var.Configuration)\dokanfuse$(var.MajorVersion).dll" Name="dokanfuse$(var.MajorVersion).dll"/>
298298
</Component>
299299
</Directory>
300300
<Directory Id="Sys64Folder" Name="SysWOW64">
301-
<Component Id="SysWOW64Files" Guid="{91199FA5-09C4-44AB-B9B3-EE0F7CC730A1}">
301+
<Component Id="SysWOW64Files" Guid="{DA6FE0D2-C4FE-4D6B-AC54-4823AC454FEE}">
302302
<File Id="DokanSysx86DLL" Source="..\Win32\$(var.Configuration)\dokan$(var.MajorVersion).dll" Name="dokan$(var.MajorVersion).dll" KeyPath="yes"/>
303303
<File Id="Dokannpx86DLL" Source="..\Win32\$(var.Configuration)\dokannp$(var.MajorVersion).dll" Name="dokannp$(var.MajorVersion).dll"/>
304304
<File Id="DokanfuseSysx86DLL" Source="..\Win32\$(var.Configuration)\dokanfuse$(var.MajorVersion).dll" Name="dokanfuse$(var.MajorVersion).dll"/>
@@ -363,21 +363,21 @@
363363
</Product>
364364

365365
<Fragment>
366-
<Component Id="ProgramFilesCygwinComponent" Win64="yes" Guid="{247A886B-934B-4B08-809D-37BA7688E943}" Directory="INSTALLDIR">
366+
<Component Id="ProgramFilesCygwinComponent" Win64="yes" Guid="{282C8A27-E596-4828-A98F-D05F4735FC2F}" Directory="INSTALLDIR">
367367
<File Id="DokanfuseCygwinDLL" Source="..\x64\Cygwin\cygdokanfuse$(var.MajorVersion).dll" Name="cygdokanfuse$(var.MajorVersion).dll" KeyPath="yes"/>
368368
<File Id="DokanfuseMsys2DLL" Source="..\x64\Msys2\libdokanfuse$(var.MajorVersion).dll" Name="libdokanfuse$(var.MajorVersion).dll" KeyPath="no"/>
369369
</Component>
370-
<Component Id="X86CygwinFiles" Guid="{219CAA2E-622C-4F34-A7F3-D1BFA75428AE}" Directory="X86PROGRAMSDIR">
370+
<Component Id="X86CygwinFiles" Guid="{8E03853C-F8AB-47EC-A84A-E704AE980408}" Directory="X86PROGRAMSDIR">
371371
<File Id="X86DokanCygFuseDLL" Source="..\Win32\Cygwin\cygdokanfuse$(var.MajorVersion).dll" Name="cygdokanfuse$(var.MajorVersion).dll" KeyPath="yes"/>
372372
<File Id="X86DokanfuseMsys2DLL" Source="..\Win32\Msys2\libdokanfuse$(var.MajorVersion).dll" Name="libdokanfuse$(var.MajorVersion).dll" KeyPath="no"/>
373373
</Component>
374-
<Component Id="SampleFuseCygwinFilesComponentX86" Win64="yes" Guid="{D612EDF0-0B92-4AB6-B8FE-34FF993D376A}" Directory="FUSEMIRRORX86DIR">
374+
<Component Id="SampleFuseCygwinFilesComponentX86" Win64="yes" Guid="{CDF50D18-B6D8-4AF7-8565-637C9BBCE8A5}" Directory="FUSEMIRRORX86DIR">
375375
<File Id="fuseMirrorEXEX86" Source="..\Win32\Cygwin\mirror.exe" Name="mirror.exe" KeyPath="yes"/>
376376
<File Id="dokanFuseMirrorDLLX86" Source="..\Win32\$(var.Configuration)\dokan$(var.MajorVersion).dll" Name="dokan$(var.MajorVersion).dll" KeyPath="no"/>
377377
<File Id="dokanCygFuseMirrorDLLX86" Source="..\Win32\Cygwin\cygdokanfuse$(var.MajorVersion).dll" Name="cygdokanfuse$(var.MajorVersion).dll" KeyPath="no"/>
378378
<File Id="fuseMirrorX86C" Source="..\samples\fuse_mirror\fusexmp.c" Name="fusexmp.c" KeyPath="no"/>
379379
</Component>
380-
<Component Id="SampleFuseMirrorCygwinComponent" Win64="yes" Guid="{260613A7-E1E0-4F91-A4BF-AD98974A05C3}" Directory="FUSEMIRRORDIR">
380+
<Component Id="SampleFuseMirrorCygwinComponent" Win64="yes" Guid="{8021F81F-E5A4-4008-8769-767B7E15D119}" Directory="FUSEMIRRORDIR">
381381
<File Id="fuseMirrorEXE" Source="..\x64\Cygwin\mirror.exe" Name="mirror.exe" KeyPath="yes"/>
382382
<File Id="dokanFuseMirrorDLL" Source="..\x64\$(var.Configuration)\dokan$(var.MajorVersion).dll" Name="dokan$(var.MajorVersion).dll" KeyPath="no"/>
383383
<File Id="dokanCygFuseMirrorDLL" Source="..\x64\Cygwin\cygdokanfuse$(var.MajorVersion).dll" Name="cygdokanfuse$(var.MajorVersion).dll" KeyPath="no"/>

0 commit comments

Comments
 (0)