From 282134fc34618ff68d7eb0b710ccfa693a215bc8 Mon Sep 17 00:00:00 2001
From: Sharmi <shpalan@microsoft.com>
Date: Wed, 15 Mar 2023 16:48:01 -0700
Subject: [PATCH] Added cgroup_sock_addr2 related files to deploy-ebpf and
 Product.wxs script (#2193)

* Added cgroup_sock_addr2 related files to deploy script

* Added bpf2c_tests in wixproj file
---
 installer/Product.wxs              | 12 ++++++++++++
 installer/ebpf-for-windows.wixproj |  8 ++++++++
 scripts/deploy-ebpf.ps1.in         |  4 ++++
 3 files changed, 24 insertions(+)

diff --git a/installer/Product.wxs b/installer/Product.wxs
index de309805a..3cf1e13bb 100644
--- a/installer/Product.wxs
+++ b/installer/Product.wxs
@@ -692,6 +692,18 @@ SPDX-License-Identifier: MIT
 			<Component Id="CGROUP_SOCK_ADDR_UM.PDB" DiskId="1" Guid="{40BC9394-DE30-468D-ABA9-8DAC8C76D492}">
 				<File Id="CGROUP_SOCK_ADDR_UM.PDB" Name="cgroup_sock_addr_um.pdb" Source="$(var.SolutionDir)$(var.Platform)\$(var.Configuration)\cgroup_sock_addr_um.pdb" />
 			</Component>
+			<Component Id="CGROUP_SOCK_ADDR2.O" DiskId="1" Guid="{EC56B373-152C-4ECB-9491-266AE910FFEC}">
+				<File Id="CGROUP_SOCK_ADDR2.O" Name="cgroup_sock_addr2.o" Source="$(var.SolutionDir)$(var.Platform)\$(var.Configuration)\cgroup_sock_addr2.o" />
+			</Component>
+			<Component Id="CGROUP_SOCK_ADDR2.SYS" DiskId="1" Guid="{3AEDA230-16DB-40D5-AE53-3312460BC741}">
+				<File Id="CGROUP_SOCK_ADDR2.SYS" Name="cgroup_sock_addr2.sys" Source="$(var.SolutionDir)$(var.Platform)\$(var.Configuration)\cgroup_sock_addr2.sys" />
+			</Component>
+			<Component Id="CGROUP_SOCK_ADDR2_UM.DLL" DiskId="1" Guid="{6CEFE90B-B8C4-4610-B295-302586D45704}">
+				<File Id="CGROUP_SOCK_ADDR2_UM.DLL" Name="cgroup_sock_addr2_um.dll" Source="$(var.SolutionDir)$(var.Platform)\$(var.Configuration)\cgroup_sock_addr2_um.dll" />
+			</Component>
+			<Component Id="CGROUP_SOCK_ADDR2_UM.PDB" DiskId="1" Guid="{AF48035A-42DE-4383-AE5B-1645FF293F6F}">
+				<File Id="CGROUP_SOCK_ADDR2_UM.PDB" Name="cgroup_sock_addr2_um.pdb" Source="$(var.SolutionDir)$(var.Platform)\$(var.Configuration)\cgroup_sock_addr2_um.pdb" />
+			</Component>
 			<Component Id="DECAP_PERMIT_PACKET.O" DiskId="1" Guid="{EAD33B50-0E47-464B-A919-1A24B64C686A}">
 				<File Id="DECAP_PERMIT_PACKET.O" Name="decap_permit_packet.o" Source="$(var.SolutionDir)$(var.Platform)\$(var.Configuration)\decap_permit_packet.o" />
 			</Component>
diff --git a/installer/ebpf-for-windows.wixproj b/installer/ebpf-for-windows.wixproj
index 0980b08f1..41f1eb11a 100644
--- a/installer/ebpf-for-windows.wixproj
+++ b/installer/ebpf-for-windows.wixproj
@@ -145,6 +145,14 @@ SPDX-License-Identifier: MIT
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
+    <ProjectReference Include="..\tests\bpf2c_tests\bpf2c_tests.vcxproj">
+      <Name>bpf2c_tests</Name>
+      <Project>{61df9973-81b9-4006-9148-52f58259bbcf}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\tools\bpftool\bpftool.vcxproj">
       <Name>bpftool</Name>
       <Project>{ca179b38-ebf5-4371-b830-73486e35250b}</Project>
diff --git a/scripts/deploy-ebpf.ps1.in b/scripts/deploy-ebpf.ps1.in
index 2832ba4c3..813186d26 100644
--- a/scripts/deploy-ebpf.ps1.in
+++ b/scripts/deploy-ebpf.ps1.in
@@ -69,6 +69,10 @@ $source_directory="."
     "cgroup_sock_addr_um.dll",
     "cgroup_sock_addr_um.pdb",
     "cgroup_sock_addr.sys",
+    "cgroup_sock_addr2.o",
+    "cgroup_sock_addr2_um.dll",
+    "cgroup_sock_addr2_um.pdb",
+    "cgroup_sock_addr2.sys",
     "decap_permit_packet.o",
     "decap_permit_packet_um.dll",
     "decap_permit_packet_um.pdb",