diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-09-20 17:28:56 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-09-20 17:31:20 -0400 |
| commit | c62e6f197ce245eaadc432784ca4d119adfb750e (patch) | |
| tree | 565bbb0b35dbca2d75f78020ec4646e34fb5861c | |
| parent | 797c8464e43c999edc2ffce781457f11c3b4e8e5 (diff) | |
| download | wix-c62e6f197ce245eaadc432784ca4d119adfb750e.tar.gz wix-c62e6f197ce245eaadc432784ca4d119adfb750e.tar.bz2 wix-c62e6f197ce245eaadc432784ca4d119adfb750e.zip | |
Update to latest authoring/tools.
| -rw-r--r-- | global.json | 2 | ||||
| -rw-r--r-- | src/wixlib/NetFxExtension_Platform.wxi | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/global.json b/global.json index 1ba230a5..4d9df50b 100644 --- a/global.json +++ b/global.json | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | { | 1 | { |
| 2 | "msbuild-sdks": { | 2 | "msbuild-sdks": { |
| 3 | "WixToolset.Sdk": "4.0.0-build-0154" | 3 | "WixToolset.Sdk": "4.0.0-build-0157" |
| 4 | } | 4 | } |
| 5 | } | 5 | } |
diff --git a/src/wixlib/NetFxExtension_Platform.wxi b/src/wixlib/NetFxExtension_Platform.wxi index 96f03d44..7bd727c5 100644 --- a/src/wixlib/NetFxExtension_Platform.wxi +++ b/src/wixlib/NetFxExtension_Platform.wxi | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | <?xml version="1.0"?> | 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 | 3 | ||
| 5 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| @@ -7,11 +6,11 @@ | |||
| 7 | <?include caDecor.wxi ?> | 6 | <?include caDecor.wxi ?> |
| 8 | 7 | ||
| 9 | <Fragment> | 8 | <Fragment> |
| 10 | <CustomAction Id="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" BinaryKey="$(var.Prefix)NetFxCA$(var.Suffix)" DllEntry="SchedNetFx" Execute="immediate" Return="check" SuppressModularization="yes" /> | 9 | <CustomAction Id="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" DllEntry="SchedNetFx" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" /> |
| 11 | <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" BinaryKey="$(var.Prefix)NetFxCA$(var.Suffix)" DllEntry="ExecNetFx" Execute="deferred" Impersonate="no" Return="ignore" SuppressModularization="yes" /> | 10 | <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" DllEntry="ExecNetFx" Execute="deferred" Impersonate="no" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" /> |
| 12 | <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" BinaryKey="$(var.Prefix)NetFxCA$(var.Suffix)" DllEntry="ExecNetFx" Execute="commit" Impersonate="no" Return="ignore" SuppressModularization="yes" /> | 11 | <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" DllEntry="ExecNetFx" Execute="commit" Impersonate="no" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" /> |
| 13 | <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" BinaryKey="$(var.Prefix)NetFxCA$(var.Suffix)" DllEntry="ExecNetFx" Execute="deferred" Impersonate="no" Return="ignore" SuppressModularization="yes" /> | 12 | <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" DllEntry="ExecNetFx" Execute="deferred" Impersonate="no" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" /> |
| 14 | <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" BinaryKey="$(var.Prefix)NetFxCA$(var.Suffix)" DllEntry="ExecNetFx" Execute="commit" Impersonate="no" Return="ignore" SuppressModularization="yes" /> | 13 | <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" DllEntry="ExecNetFx" Execute="commit" Impersonate="no" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" /> |
| 15 | 14 | ||
| 16 | <InstallExecuteSequence> | 15 | <InstallExecuteSequence> |
| 17 | <Custom Action="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" Before="InstallFiles" Overridable="yes" /> | 16 | <Custom Action="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" Before="InstallFiles" Overridable="yes" /> |