From 64e6812784d3b7bd74a8e797a9e5db7b94e2bb7b Mon Sep 17 00:00:00 2001
From: Gianni Trevisiol <gtrevi@users.noreply.github.com>
Date: Tue, 31 Jan 2023 10:03:20 -0800
Subject: [PATCH] Add JIT option for MSI Release bits and CI/CD. (#1986)

---
 .github/workflows/cicd.yml         |  1 +
 installer/Product.wxs              | 11 +++++++++--
 installer/ebpf-for-windows.wixproj |  8 +++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 7ac550ee7..00262a3dc 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -42,6 +42,7 @@ jobs:
       build_artifact: Build-x64
       generate_release_package: true
       build_nuget: true
+      build_options: /p:ReleaseJIT='True'
 
   cmake:
     # Always run this job.
diff --git a/installer/Product.wxs b/installer/Product.wxs
index 92113b5bb..17ac49cb2 100644
--- a/installer/Product.wxs
+++ b/installer/Product.wxs
@@ -34,11 +34,18 @@ SPDX-License-Identifier: MIT
 				<ComponentGroupRef Id="eBPF_Runtime_Components" />
 				<ComponentGroupRef Id="eBPFCore_Driver" />
 				<ComponentGroupRef Id="NetEbpfExt_Driver" />
+				<?if $(var.IncludeJIT) = True ?>
 				<?if $(var.Configuration) = Debug ?>
 				<Feature Id="eBPF_Runtime_Components_JIT" Level="1" Title="JIT" Absent="allow">
 					<ComponentGroupRef Id="eBPF_Service" />
 				</Feature>
 				<?endif?>
+				<?if $(var.Configuration) = Release ?>
+				<Feature Id="eBPF_Runtime_Components_JIT" Level="11" Title="JIT" Absent="allow" >
+					<ComponentGroupRef Id="eBPF_Service" />
+				</Feature>
+				<?endif?>
+				<?endif?>
 			</Feature>
 			<Feature Id="eBPF_Development" Level="2" Title="Development components">
 				<ComponentGroupRef Id="eBPF_Development_include" />
@@ -119,7 +126,7 @@ SPDX-License-Identifier: MIT
 		<Directory Id="TARGETDIR" Name="SourceDir">
 			<Directory Id="ProgramFiles64Folder">
 				<Directory Id="INSTALLFOLDER" Name="ebpf-for-windows">
-					<?if $(var.Configuration) = Debug ?>
+					<?if $(var.IncludeJIT) = True ?>
 					<Directory Id="dir_JIT" Name="JIT" />
 					<?endif?>
 					<Directory Id="dir_drivers" Name="drivers"/>
@@ -209,7 +216,7 @@ SPDX-License-Identifier: MIT
 		<CustomAction Id="eBPF_netsh_helper_uninstall_rollback" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Return="ignore" Impersonate="no"/>
 
 		<!--Install/Uninstall the eBPF Service -->
-		<?if $(var.Configuration) = Debug ?>
+		<?if $(var.IncludeJIT) = True ?>
 		<ComponentGroup Id="eBPF_Service" Directory="dir_JIT">
 			<Component Id="EBPFSVC.PDB" DiskId="1" Guid="{D1935DF0-2FC7-42F5-81E5-19AF88D6244B}">
 				<File Id="EBPFSVC.PDB" Name="EbpfSvc.pdb" Source="$(var.ebpfsvc.TargetDir)ebpfsvc.pdb" />
diff --git a/installer/ebpf-for-windows.wixproj b/installer/ebpf-for-windows.wixproj
index 95a054ae5..7c55c103c 100644
--- a/installer/ebpf-for-windows.wixproj
+++ b/installer/ebpf-for-windows.wixproj
@@ -17,13 +17,15 @@ SPDX-License-Identifier: MIT
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug</DefineConstants>
+    <DefineConstants>Debug;IncludeJIT=True</DefineConstants>
+    <SuppressValidation>True</SuppressValidation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>
-    </DefineConstants>
+    <DefineConstants Condition=" '$(ReleaseJIT)' == 'True' ">IncludeJIT=True</DefineConstants>
+    <DefineConstants Condition=" '$(ReleaseJIT)' == 'False' OR '$(ReleaseJIT)' == '' ">IncludeJIT=False</DefineConstants>
+    <SuppressValidation>True</SuppressValidation>
   </PropertyGroup>
   <!-- In accordance to what defined in sample.vcxproj, the MSI build is disabled for the 'Analysis' CI/CD build, as it  does not generate the *.o artifacts. -->
   <ItemGroup Condition="'$(Analysis)'==''">