diff options
| author | Bob Arnson <bob@firegiant.com> | 2024-02-16 18:34:12 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2024-02-16 19:20:19 -0500 |
| commit | 3fa17617b89d62103cc35b37424ab6fa5b9f08be (patch) | |
| tree | 4ffc6886599280ae558c2175f63ccb66419b1dea /src/ext/NetFx | |
| parent | eb2f85d7ee5ad5c91af0943ffe936ee8ccfdab0d (diff) | |
| download | wix-3fa17617b89d62103cc35b37424ab6fa5b9f08be.tar.gz wix-3fa17617b89d62103cc35b37424ab6fa5b9f08be.tar.bz2 wix-3fa17617b89d62103cc35b37424ab6fa5b9f08be.zip | |
Switch to `virtual` access modifiers...
...from `Overridable="yes"`.
Fixes https://github.com/wixtoolset/issues/issues/7981 for WiX v5.
Diffstat (limited to 'src/ext/NetFx')
| -rw-r--r-- | src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi b/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi index ddafe769..725b2700 100644 --- a/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi +++ b/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi | |||
| @@ -12,11 +12,11 @@ | |||
| 12 | <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" DllEntry="ExecNetFx" Execute="commit" Impersonate="no" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" /> | 12 | <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" DllEntry="ExecNetFx" Execute="commit" Impersonate="no" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" /> |
| 13 | 13 | ||
| 14 | <InstallExecuteSequence> | 14 | <InstallExecuteSequence> |
| 15 | <Custom Action="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" Before="InstallFiles" Overridable="yes" /> | 15 | <Custom Action="virtual $(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" Before="InstallFiles" /> |
| 16 | <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" After="MsiPublishAssemblies" Overridable="yes" Condition="RollbackDisabled <> 1" /> | 16 | <Custom Action="virtual $(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" After="MsiPublishAssemblies" Condition="RollbackDisabled <> 1" /> |
| 17 | <Custom Action="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled = 1" /> | 17 | <Custom Action="virtual $(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" Condition="RollbackDisabled = 1" /> |
| 18 | <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled <> 1" /> | 18 | <Custom Action="virtual $(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" Condition="RollbackDisabled <> 1" /> |
| 19 | <Custom Action="$(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled = 1" /> | 19 | <Custom Action="virtual $(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" Condition="RollbackDisabled = 1" /> |
| 20 | </InstallExecuteSequence> | 20 | </InstallExecuteSequence> |
| 21 | </Fragment> | 21 | </Fragment> |
| 22 | 22 | ||
| @@ -28,11 +28,11 @@ | |||
| 28 | <CustomAction Id="$(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" DllEntry="DotNetCompatibilityCheck" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" /> | 28 | <CustomAction Id="$(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" DllEntry="DotNetCompatibilityCheck" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" /> |
| 29 | 29 | ||
| 30 | <InstallExecuteSequence> | 30 | <InstallExecuteSequence> |
| 31 | <Custom Action="$(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" Before="LaunchConditions" Overridable="yes" /> | 31 | <Custom Action="virtual $(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" Before="LaunchConditions" /> |
| 32 | </InstallExecuteSequence> | 32 | </InstallExecuteSequence> |
| 33 | 33 | ||
| 34 | <InstallUISequence> | 34 | <InstallUISequence> |
| 35 | <Custom Action="$(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" Before="LaunchConditions" Overridable="yes" /> | 35 | <Custom Action="virtual $(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" Before="LaunchConditions" /> |
| 36 | </InstallUISequence> | 36 | </InstallUISequence> |
| 37 | 37 | ||
| 38 | <Binary Id="$(var.Prefix)NetCheck_x86" SourceFile="!(bindpath.x86)NetCoreCheck.exe" /> | 38 | <Binary Id="$(var.Prefix)NetCheck_x86" SourceFile="!(bindpath.x86)NetCoreCheck.exe" /> |