fix asp.net core search

template improvements
iswix-llc · Nov 16, 2023 · cad92af · cad92af
1 parent c908009
commit cad92af
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 4 deletions.
diff --git a/...tion/IsWiX2022AddIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/IISMeta.wxs b/...tion/IsWiX2022AddIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/IISMeta.wxs
@@ -4,7 +4,7 @@
       <ComponentRef Id="webSite" />
     </ComponentGroup>
     <PropertyRef Id="IISMAJORVERSION" />
-    <netfx:DotNetCoreSearch RuntimeType="aspnet" MajorVersion="7" Platform="x64" Variable="ASPNETCOREVERSION"/>
+    <netfx:DotNetCompatibilityCheck  RuntimeType="aspnet" Version="7.0.0" Platform="$(Platform)" RollForward="latestMajor"  Property="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">

diff --git a/...dIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/IsWiXPackageProject.wixproj b/...dIn/HeatWaveInternalUISolutionTemplate/PackageProjectTemplate/IsWiXPackageProject.wixproj
@@ -35,7 +35,14 @@
     <DefineConstants>MSIProductVersion=$(MSIProductVersion)</DefineConstants>
     <WixVariables>WixUIBannerBmp=Resources\Banner.jpg;WixUIDialogBmp=Resources\Dialog.jpg;WixUILicenseRtf=Resources\EULA.rtf</WixVariables>
   </PropertyGroup>
-  <ItemGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM64' ">
+		<DefineConstants>Debug;MSIProductVersion=$(MSIProductVersion)</DefineConstants>
+		<WixVariables>WixUIBannerBmp=Resources\Banner.jpg;WixUIDialogBmp=Resources\Dialog.jpg;WixUILicenseRtf=Resources\EULA.rtf</WixVariables>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM64' ">
+		<DefineConstants>MSIProductVersion=$(MSIProductVersion)</DefineConstants>
+		<WixVariables>WixUIBannerBmp=Resources\Banner.jpg;WixUIDialogBmp=Resources\Dialog.jpg;WixUILicenseRtf=Resources\EULA.rtf</WixVariables>
+	</PropertyGroup><ItemGroup>
     <Content Include="Resources\Banner.jpg" />
     <Content Include="Resources\Dialog.jpg" />
     <Content Include="Resources\Icon.ico" />

diff --git a/Application/IsWiX2022AddIn/HeatWaveMSISolutionTemplate/SetupProjectTemplate/IISMeta.wxs b/Application/IsWiX2022AddIn/HeatWaveMSISolutionTemplate/SetupProjectTemplate/IISMeta.wxs
@@ -4,7 +4,7 @@
       <ComponentRef Id="webSite" />
     </ComponentGroup>
     <PropertyRef Id="IISMAJORVERSION" />
-    <netfx:DotNetCoreSearch RuntimeType="aspnet" MajorVersion="7" Platform="x64" Variable="ASPNETCOREVERSION"/>
+    <netfx:DotNetCompatibilityCheck  RuntimeType="aspnet" Version="7.0.0" Platform="$(Platform)" RollForward="latestMajor"  Property="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">

diff --git a/...IsWiX2022AddIn/HeatWaveMSISolutionTemplate/SetupProjectTemplate/IsWiXSetupProject.wixproj b/...IsWiX2022AddIn/HeatWaveMSISolutionTemplate/SetupProjectTemplate/IsWiXSetupProject.wixproj
@@ -34,6 +34,14 @@
     <DefineConstants>MSIProductVersion=$(MSIProductVersion)</DefineConstants>
     <WixVariables>WixUIBannerBmp=Resources\Banner.jpg;WixUIDialogBmp=Resources\Dialog.jpg;WixUILicenseRtf=Resources\EULA.rtf</WixVariables>
   </PropertyGroup>
+ 	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM64' ">
+		<DefineConstants>Debug;MSIProductVersion=$(MSIProductVersion)</DefineConstants>
+		<WixVariables>WixUIBannerBmp=Resources\Banner.jpg;WixUIDialogBmp=Resources\Dialog.jpg;WixUILicenseRtf=Resources\EULA.rtf</WixVariables>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM64' ">
+		<DefineConstants>MSIProductVersion=$(MSIProductVersion)</DefineConstants>
+		<WixVariables>WixUIBannerBmp=Resources\Banner.jpg;WixUIDialogBmp=Resources\Dialog.jpg;WixUILicenseRtf=Resources\EULA.rtf</WixVariables>
+	</PropertyGroup>
   <ItemGroup>
     <Content Include="Resources\Banner.jpg" />
     <Content Include="Resources\Dialog.jpg" />

diff --git a/...tion/IsWiX2022AddIn/HeatWaveStandardBASolutionTemplate/PackageProjectTemplate/IISMeta.wxs b/...tion/IsWiX2022AddIn/HeatWaveStandardBASolutionTemplate/PackageProjectTemplate/IISMeta.wxs
@@ -4,7 +4,7 @@
       <ComponentRef Id="webSite" />
     </ComponentGroup>
     <PropertyRef Id="IISMAJORVERSION" />
-    <netfx:DotNetCoreSearch RuntimeType="aspnet" MajorVersion="7" Platform="x64" Variable="ASPNETCOREVERSION"/>
+    <netfx:DotNetCompatibilityCheck  RuntimeType="aspnet" Version="7.0.0" Platform="$(Platform)" RollForward="latestMajor"  Property="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">

diff --git a/...dIn/HeatWaveStandardBASolutionTemplate/PackageProjectTemplate/IsWiXPackageProject.wixproj b/...dIn/HeatWaveStandardBASolutionTemplate/PackageProjectTemplate/IsWiXPackageProject.wixproj
@@ -35,6 +35,14 @@
     <DefineConstants>MSIProductVersion=$(MSIProductVersion)</DefineConstants>
     <WixVariables></WixVariables>
   </PropertyGroup>
+  	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM64' ">
+		<DefineConstants>Debug;MSIProductVersion=$(MSIProductVersion)</DefineConstants>
+		<WixVariables>WixUIBannerBmp=Resources\Banner.jpg;WixUIDialogBmp=Resources\Dialog.jpg;WixUILicenseRtf=Resources\EULA.rtf</WixVariables>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM64' ">
+		<DefineConstants>MSIProductVersion=$(MSIProductVersion)</DefineConstants>
+		<WixVariables>WixUIBannerBmp=Resources\Banner.jpg;WixUIDialogBmp=Resources\Dialog.jpg;WixUILicenseRtf=Resources\EULA.rtf</WixVariables>
+	</PropertyGroup>
   <ItemGroup>
     <PackageReference Include="WixToolset.Iis.wixext" Version="4.0.3" />
     <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.3" />