Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
UsbDk
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
winadmin
UsbDk
Commits
458ad0f9
Commit
458ad0f9
authored
9 years ago
by
Dmitry Fleytman
Browse files
Options
Downloads
Patches
Plain Diff
Installer: Fix MSI reinstallation and downgrade
Signed-off-by:
Dmitry Fleytman
<
dfleytma@redhat.com
>
parent
cf281029
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Tools/Installer/UsbDkInstaller.wxs
+12
-2
12 additions, 2 deletions
Tools/Installer/UsbDkInstaller.wxs
Tools/Installer/buildmsi.bat
+2
-2
2 additions, 2 deletions
Tools/Installer/buildmsi.bat
with
14 additions
and
4 deletions
Tools/Installer/UsbDkInstaller.wxs
+
12
−
2
View file @
458ad0f9
...
...
@@ -43,6 +43,11 @@
Minimum=
"0.0.0.0"
Maximum=
"$(var.UsbDkVersion)"
Property=
"PREVIOUSVERSIONSINSTALLED"
IncludeMinimum=
"yes"
IncludeMaximum=
"no"
/>
<UpgradeVersion
Minimum=
"$(var.UsbDkVersion)"
Maximum=
"99.99.99.99"
Property=
"NEWERVERSIONINSTALLED"
IncludeMinimum=
"no"
IncludeMaximum=
"yes"
/>
</Upgrade>
<Directory
Id=
"TARGETDIR"
Name=
"SourceDir"
>
...
...
@@ -105,10 +110,15 @@
Return=
"ignore"
>
</CustomAction>
<CustomAction
Id=
"PreventDowngrading"
Error=
"Error: Newer version of UsbDk already installed."
>
</CustomAction>
<InstallExecuteSequence>
<RemoveExistingProducts
Before
=
"InstallInitialize"
/
>
<RemoveExistingProducts
After
=
"InstallInitialize"
>
PREVIOUSVERSIONSINSTALLED
<>
""
</RemoveExistingProducts
>
<Custom
Action=
"InstallDriver"
After=
"InstallFiles"
>
NOT Installed
</Custom>
<Custom
Action=
"UninstallDriver"
Before=
"RemoveFiles"
>
Installed
</Custom>
<Custom
Action=
"UninstallDriver"
Before=
"RemoveFiles"
>
REMOVE
</Custom>
<Custom
Action=
"PreventDowngrading"
After=
"FindRelatedProducts"
>
NEWERVERSIONINSTALLED
<>
"" AND NOT Installed
</Custom>
</InstallExecuteSequence>
<Feature
Id=
"ProductFeature"
Title=
"UsbDk Runtime Libraries"
Level=
"1"
>
...
...
This diff is collapsed.
Click to expand it.
Tools/Installer/buildmsi.bat
+
2
−
2
View file @
458ad0f9
SETLOCAL
EnableExtensions
EnableDelayedExpansion
IF
[
%UsbDkVersion%
]
==
[]
SET
UsbDkVersion
=
99
.99.9
9
IF
[
%UsbDkVersion%
]
==
[
".."
]
SET
UsbDkVersion
=
99
.99.9
9
IF
[
%UsbDkVersion%
]
==
[]
SET
UsbDkVersion
=
99
.99.9
0
IF
[
%UsbDkVersion%
]
==
[
".."
]
SET
UsbDkVersion
=
99
.99.9
0
pushd
..\..\Install_Debug\x86
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment