Revert "Try delenting wxi"haok/clean

This reverts commit cd2471d0aff475a1b2976e56c90320f62b23ccb0.

5 files changed, 187 insertions, 0 deletions

diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ElevatedShortcut.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ElevatedShortcut.wxi
new file mode 100644
index 0000000000..ee5e988a1b
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ElevatedShortcut.wxi
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the MIT license.
+-->
+
+<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Fragment Id="Fragment.IIS.OOB.Common.ElevatedShortcut">
+    <CustomAction Id="ScheduleMakeShortcutElevated" BinaryKey="IISCustomActionDll" DllEntry="ScheduleMakeShortcutElevatedCA" Execute="immediate" Return="check" />
+    
+    <!-- Deferred custom actions scheduled by the immediate actions above -->
+    <CustomAction Id="ExecuteMakeShortcutElevated" BinaryKey="IISCustomActionDll" DllEntry="ExecuteMakeShortcutElevatedCA" Execute="deferred" Return="check" Impersonate="no" />
+    
+    <CustomTable Id="IISElevatedShortcut">
+      <!--<Column Id='Name' Type='string' PrimaryKey='yes' />-->
+      <Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="Identifier" Width="72"/>
+    </CustomTable>
+    
+    <InstallExecuteSequence>
+      <Custom Action='ScheduleMakeShortcutElevated' After='CreateShortcuts'>NOT SKIPMAKESHORTCUTELEVATED</Custom>
+    </InstallExecuteSequence>
+  </Fragment>
+</Include>  
+
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/FixPatchingBehavior.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/FixPatchingBehavior.wxi
new file mode 100644
index 0000000000..ae6e3b76d5
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/FixPatchingBehavior.wxi
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the MIT license.
+-->
+
+<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+
+<!-- This is the old fragment:
+
+  <Fragment Id="Fragment.IIS.OOB.Common.FixPatchingBehavior">
+
+To add this to your wxs file, add:
+
+    <?include $(var.PROJECT_ROOT)\setup\iisca\wix3\filename.wxi ?>
+
+-->
+
+    <!-- 
+          fragment makes the patching experience show the welcome screen followed by the  ready dialog 
+          this prevents the user from seeing the repair/remove/change screen when they double-click the patch.
+          we decided that it is confusing to see a remove button when the intention was to patch the product.
+      -->
+  
+    <CustomAction Id="CustomAction_ChangeInstallMode" Property="WixUI_InstallMode" Value="Repair"/>
+    <CustomAction Id="CustomAction_ChangeNextOnPatch" Property="WixUI_MaintenanceWelcomeDlg_Next" Value="VerifyReadyDlg"/>
+    <CustomAction Id="CustomAction_ChangeBackOnPatch" Property="WixUI_VerifyReadyDlg_BackRepair" Value="MaintenanceWelcomeDlg"/>
+    
+    <InstallUISequence>
+      <Custom Action="CustomAction_ChangeInstallMode" Before="MaintenanceWelcomeDlg">Installed And PATCH</Custom>
+      <Custom Action="CustomAction_ChangeNextOnPatch" Before="MaintenanceWelcomeDlg">Installed And PATCH</Custom>
+      <Custom Action="CustomAction_ChangeBackOnPatch" Before="MaintenanceWelcomeDlg">Installed And PATCH</Custom>
+    </InstallUISequence>
+
+</Include>  
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/HttpListener.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/HttpListener.wxi
new file mode 100644
index 0000000000..68db6852d1
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/HttpListener.wxi
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the MIT license.
+-->
+
+<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+
+<!-- This is the old fragment:
+
+  <Fragment Id="Fragment.IIS.OOB.Common.HttpListener">
+
+To add this to your wxs file, add:
+
+    <?include $(var.PROJECT_ROOT)\setup\iisca\wix3\filename.wxi ?>
+
+-->
+
+
+    <!-- Immediate custom actions which will package and schedule deferred actions for httpsys -->
+    <CustomAction Id="ScheduleInstallHttpListener" BinaryKey="IISCustomActionDll" DllEntry="ScheduleInstallHttpListenerCA" Execute="immediate" Return="check" />
+    <CustomAction Id="ScheduleUnInstallHttpListener" BinaryKey="IISCustomActionDll" DllEntry="ScheduleUnInstallHttpListenerCA" Execute="immediate" Return="check"  />
+    
+    <!-- Deferred custom actions scheduled by the immediate actions above -->
+    <CustomAction Id="ExecuteInstallHttpListener" BinaryKey="IISCustomActionDll" DllEntry="ExecuteInstallHttpListenerCA" Execute="deferred" Return="check" Impersonate="no" />
+    <CustomAction Id="ExecuteUnInstallHttpListener" BinaryKey="IISCustomActionDll" DllEntry="ExecuteUnInstallHttpListenerCA" Execute="deferred" Return="check" Impersonate="no" />
+    
+    <!-- Setup Custom Action Parameters -->
+    
+    <!-- Define a table to hold registration parameters -->
+    <CustomTable Id='IISHttpListener'>
+      <Column Id='Name' Type='string' PrimaryKey='yes' />
+      <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
+      <Column Id='Account' Type='string' />
+      <Column Id='Prefix' Type='string' />
+    </CustomTable>
+    
+    <InstallExecuteSequence>
+      <Custom Action='ScheduleInstallHttpListener' After='InstallFiles'>NOT SKIPINSTALLHTTPLISTENER</Custom>
+      <Custom Action='ScheduleUnInstallHttpListener' Before='RemoveFiles'>NOT SKIPUNINSTALLHTTPLISTENER</Custom>
+    </InstallExecuteSequence>
+</Include>  
+
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ShortcutConsoleProperties.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ShortcutConsoleProperties.wxi
new file mode 100644
index 0000000000..236e0f51ef
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ShortcutConsoleProperties.wxi
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the MIT license.
+-->
+
+<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+
+<!-- This is the old fragment:
+
+  <Fragment Id="Fragment.IIS.OOB.Common.ShortcutConsoleProperties">
+
+To add this to your wxs file, add:
+
+    <?include $(var.PROJECT_ROOT)\setup\iisca\wix3\filename.wxi ?>
+
+-->
+
+    <CustomAction Id="ScheduleSetConsoleProperties" BinaryKey="IISCustomActionDll" DllEntry="ScheduleSetConsolePropertiesCA" Execute="immediate" Return="check" />
+    
+    <!-- Deferred custom actions scheduled by the immediate actions above -->
+    <CustomAction Id="ExecuteSetConsoleProperties" BinaryKey="IISCustomActionDll" DllEntry="ExecuteSetConsolePropertiesCA" Execute="deferred" Return="check" Impersonate="no" />
+    
+    <CustomTable Id="IISShortcutConsoleProperties">
+      <!--<Column Id='Name' Type='string' PrimaryKey='yes' />-->
+      <Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="Identifier" Width="72"/>
+      <Column Id="QuickEdit" Type="int" Width="2" MinValue="0" MaxValue="1" Nullable="no" />
+      <Column Id="InsertMode" Type="int" Width="2"  MinValue="0" MaxValue="1" Nullable="no"/>
+      <Column Id="WindowWidth" Type="int" Width="2" Nullable="no"/>
+      <Column Id="WindowHeight" Type="int" Width="2" Nullable="no"/>
+      <Column Id="BufferWidth" Type="int" Width="2" Nullable="no"/>
+      <Column Id="BufferHeight" Type="int" Width="2" Nullable="no"/>
+      <!--<Column Id="TextColor" Type="string"  Width="11" Nullable="yes"/>
+      <Column Id="BackgroundColor" Type="string" Width="11" Nullable="yes" Category="Formatted"/>-->
+    </CustomTable>
+    
+    <InstallExecuteSequence>
+      <Custom Action='ScheduleSetConsoleProperties' After='CreateShortcuts'>NOT SKIPSETCONSOLEPROPERTIES</Custom>
+    </InstallExecuteSequence>
+</Include>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/WindowsHotfix.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/WindowsHotfix.wxi
new file mode 100644
index 0000000000..78b26d6404
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/WindowsHotfix.wxi
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the MIT license.
+-->
+
+<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+
+<!-- This is the old fragment:
+
+  <Fragment Id="Fragment.IIS.OOB.Common.WindowsHotfix">
+
+To add this to your wxs file, add:
+
+    <?include $(var.PROJECT_ROOT)\setup\iisca\wix3\filename.wxi ?>
+
+-->
+
+    <CustomAction Id="ScheduleInstallWindowsHotfix" BinaryKey="IISCustomActionDll" DllEntry="ScheduleInstallWindowsHotfixCA" Execute="immediate" Return="check" />
+    <!-- Deferred custom actions scheduled by the immediate actions above -->
+    <CustomAction Id="ExecuteInstallWindowsHotfix" BinaryKey="IISCustomActionDll" DllEntry="ExecuteInstallWindowsHotfixCA" Execute="deferred" Return="check" Impersonate="no" />
+    <CustomAction Id="RollbackCleanUpWindowsHotfix" BinaryKey="IISCustomActionDll" DllEntry="ExecuteCleanUpWindowsHotfixCA" Execute="rollback" Return="check" Impersonate="no" />
+    <CustomAction Id="CommitCleanUpWindowsHotfix" BinaryKey="IISCustomActionDll" DllEntry="ExecuteCleanUpWindowsHotfixCA" Execute="commit" Return="check" Impersonate="no" />
+    
+    <CustomAction Id="ScheduleRebootIfRequired" BinaryKey="IISCustomActionDll" DllEntry="ScheduleRebootIfRequiredCA" Execute="immediate" Return="check" />
+    
+    <CustomTable Id="IISWindowsHotfix">
+      <Column Id="Name" Type="string" PrimaryKey="yes"/>
+      <Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="Identifier" Width="72"/>
+      <Column Id="OSMajorVersion" Type="int" Width="4" Nullable="yes"/>
+      <Column Id="OSMinorVersion" Type="int" Width="4" Nullable="yes"/>
+      <Column Id="SPMajorVersion" Type="int" Width="2" Nullable="yes"/>
+      <Column Id="Condition" Type="string" Category="Condition" Nullable="yes"/>
+    </CustomTable>
+    
+    <InstallExecuteSequence>
+      <Custom Action="ScheduleInstallWindowsHotfix" Before="RemoveFiles">NOT SKIPINSTALLWINDOWSHOTFIX</Custom>
+      <Custom Action="ScheduleRebootIfRequired" After="InstallFinalize">NOT SKIPREBOOTIFREQUIRED</Custom>
+    </InstallExecuteSequence>
+</Include>