add aspnet core check

iswix-llc · Nov 7, 2023 · 18b1695 · 18b1695
1 parent 668c803
commit 18b1695
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...tion/IsWiX2022AddIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/IISMeta.wxs b/...tion/IsWiX2022AddIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/IISMeta.wxs
@@ -1,11 +1,13 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:iis="http://wixtoolset.org/schemas/v4/wxs/iis">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:iis="http://wixtoolset.org/schemas/v4/wxs/iis"  xmlns:iis="http://wixtoolset.org/schemas/v4/wxs/iis" xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
   <Fragment>
     <ComponentGroup Id="webSite">
       <ComponentRef Id="webSite" />
     </ComponentGroup>
     <PropertyRef Id="IISMAJORVERSION" />
+    <netfx:DotNetCoreSearch RuntimeType="aspnet" MajorVersion="7" Platform="x64" Variable="ASPNETCOREVERSION"/>
     <Launch Condition="Installed OR IISMAJORVERSION" Message="[ProductName] requires Microsoft IIS"/>
-    <DirectoryRef Id="INSTALLLOCATION">
+    <Launch Condition="Installed OR ASPNETCOREVERSION" Message="[ProductName] requires ASP.NET Core 7.x (Hosting Bundle)"/>
+   <DirectoryRef Id="INSTALLLOCATION">
       <Directory Id="webSite" Name="WebSite">
         <Component Id="webSite" Guid="$guid4$" KeyPath="yes">
           <iis:WebAppPool Id="webSite" Name="$safeprojectname$" Identity="applicationPoolIdentity" ManagedRuntimeVersion="v4.0" ManagedPipelineMode="Integrated"/>

diff --git a/...tion/IsWiX2022AddIn/HeatWaveStandardBASolutionTemplate/PackageProjectTemplate/IISMeta.wxs b/...tion/IsWiX2022AddIn/HeatWaveStandardBASolutionTemplate/PackageProjectTemplate/IISMeta.wxs
@@ -1,10 +1,12 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:iis="http://wixtoolset.org/schemas/v4/wxs/iis">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:iis="http://wixtoolset.org/schemas/v4/wxs/iis" xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
   <Fragment>
     <ComponentGroup Id="webSite">
       <ComponentRef Id="webSite" />
     </ComponentGroup>
     <PropertyRef Id="IISMAJORVERSION" />
+    <netfx:DotNetCoreSearch RuntimeType="aspnet" MajorVersion="7" Platform="x64" Variable="ASPNETCOREVERSION"/>
     <Launch Condition="Installed OR IISMAJORVERSION" Message="[ProductName] requires Microsoft IIS"/>
+    <Launch Condition="Installed OR ASPNETCOREVERSION" Message="[ProductName] requires ASP.NET Core 7.x (Hosting Bundle)"/>
     <DirectoryRef Id="INSTALLLOCATION">
       <Directory Id="webSite" Name="WebSite">
         <Component Id="webSite" Guid="$guid4$" KeyPath="yes">