diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-09-02 13:40:46 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-09-02 14:09:22 -0400 |
| commit | ebf83fdc9814dfdfc74f4e215f749a4366421677 (patch) | |
| tree | b800928f5e31bcd41420712833d10b8602033554 | |
| parent | c134594328bd63fb19b88239694523f04108030e (diff) | |
| download | wix-ebf83fdc9814dfdfc74f4e215f749a4366421677.tar.gz wix-ebf83fdc9814dfdfc74f4e215f749a4366421677.tar.bz2 wix-ebf83fdc9814dfdfc74f4e215f749a4366421677.zip | |
Fix Condition authoring.
| -rw-r--r-- | src/wixlib/SqlExtension.wxi | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/wixlib/SqlExtension.wxi b/src/wixlib/SqlExtension.wxi index 43b91fba..9d7d2495 100644 --- a/src/wixlib/SqlExtension.wxi +++ b/src/wixlib/SqlExtension.wxi | |||
| @@ -1,17 +1,16 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
| 3 | 2 | ||
| 4 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 3 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 5 | <?include caDecor.wxi ?> | 4 | <?include caDecor.wxi ?> |
| 6 | 5 | ||
| 7 | <Fragment> | 6 | <Fragment> |
| 8 | <UI> | 7 | <UI> |
| 9 | <ProgressText Action="$(var.Prefix)InstallSqlData$(var.Suffix)">!(loc.ConfigureSql)</ProgressText> | 8 | <ProgressText Action="$(var.Prefix)InstallSqlData$(var.Suffix)" Message="!(loc.ConfigureSql)" /> |
| 10 | <ProgressText Action="$(var.Prefix)UninstallSqlData$(var.Suffix)">!(loc.ConfigureSql)</ProgressText> | 9 | <ProgressText Action="$(var.Prefix)UninstallSqlData$(var.Suffix)" Message="!(loc.ConfigureSql)" /> |
| 11 | <ProgressText Action="$(var.Prefix)CreateDatabase$(var.Suffix)">!(loc.CreateDatabase)</ProgressText> | 10 | <ProgressText Action="$(var.Prefix)CreateDatabase$(var.Suffix)" Message="!(loc.CreateDatabase)" /> |
| 12 | <ProgressText Action="$(var.Prefix)DropDatabase$(var.Suffix)">!(loc.DropDatabase)</ProgressText> | 11 | <ProgressText Action="$(var.Prefix)DropDatabase$(var.Suffix)" Message="!(loc.DropDatabase)" /> |
| 13 | <ProgressText Action="$(var.Prefix)ExecuteSqlStrings$(var.Suffix)">!(loc.ExecuteSqlStrings)</ProgressText> | 12 | <ProgressText Action="$(var.Prefix)ExecuteSqlStrings$(var.Suffix)" Message="!(loc.ExecuteSqlStrings)" /> |
| 14 | <ProgressText Action="$(var.Prefix)RollbackExecuteSqlStrings$(var.Suffix)">!(loc.RollbackExecuteSqlStrings)</ProgressText> | 13 | <ProgressText Action="$(var.Prefix)RollbackExecuteSqlStrings$(var.Suffix)" Message="!(loc.RollbackExecuteSqlStrings)" /> |
| 15 | </UI> | 14 | </UI> |
| 16 | 15 | ||
| 17 | <!-- The SQL custom actions impersonate the user because the user's credentials are used when connecting to the database if none are provided. --> | 16 | <!-- The SQL custom actions impersonate the user because the user's credentials are used when connecting to the database if none are provided. --> |
| @@ -24,8 +23,8 @@ | |||
| 24 | <CustomAction Id="$(var.Prefix)RollbackExecuteSqlStrings$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="ExecuteSqlStrings" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" /> | 23 | <CustomAction Id="$(var.Prefix)RollbackExecuteSqlStrings$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="ExecuteSqlStrings" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" /> |
| 25 | 24 | ||
| 26 | <InstallExecuteSequence> | 25 | <InstallExecuteSequence> |
| 27 | <Custom Action="$(var.Prefix)UninstallSqlData$(var.Suffix)" Before="RemoveFiles" Overridable="yes">NOT SKIPUNINSTALLSQLDATA AND VersionNT > 400</Custom> | 26 | <Custom Action="$(var.Prefix)UninstallSqlData$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="NOT SKIPUNINSTALLSQLDATA AND VersionNT > 400" /> |
| 28 | <Custom Action="$(var.Prefix)InstallSqlData$(var.Suffix)" After="InstallFiles" Overridable="yes">NOT SKIPINSTALLSQLDATA AND VersionNT > 400</Custom> | 27 | <Custom Action="$(var.Prefix)InstallSqlData$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="NOT SKIPINSTALLSQLDATA AND VersionNT > 400" /> |
| 29 | </InstallExecuteSequence> | 28 | </InstallExecuteSequence> |
| 30 | </Fragment> | 29 | </Fragment> |
| 31 | 30 | ||