Fix installer project

Signed-off-by: Dave Thaler <[email protected]>
microsoft · Aug 10, 2023 · d6601c2 · d6601c2
1 parent d6f1445
commit d6601c2
Show file tree

Hide file tree

Showing 6 changed files with 118 additions and 55 deletions.
diff --git a/ebpf-for-windows.sln b/ebpf-for-windows.sln
@@ -224,6 +224,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbtf", "external\ebpf-verifier\build\external\libbtf\libbtf\libbtf.vcxproj", "{249E3FBC-0098-3E3E-80AE-C8F8EF6AB0E5}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usersim_dll_skeleton", "external\usersim\usersim_dll_skeleton\usersim_dll_skeleton.vcxproj", "{1937DB41-F3EB-4955-A636-6386DCB394F6}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EbpfCore_Usersim", "ebpfcore\usersim\EbpfCore_Usersim.vcxproj", "{1FDAD2FD-EBD8-462A-B285-ED5174E55079}"
 EndProject
 Global
@@ -302,6 +303,7 @@ Global
 		{675B59F8-089E-40B5-8388-56254447CFA3}.FuzzerDebug|ARM64.Build.0 = FuzzerDebug|x64
 		{675B59F8-089E-40B5-8388-56254447CFA3}.FuzzerDebug|ARM64.Deploy.0 = FuzzerDebug|x64
 		{675B59F8-089E-40B5-8388-56254447CFA3}.FuzzerDebug|x64.ActiveCfg = FuzzerDebug|x64
+		{675B59F8-089E-40B5-8388-56254447CFA3}.FuzzerDebug|x64.Build.0 = FuzzerDebug|x64
 		{675B59F8-089E-40B5-8388-56254447CFA3}.FuzzerDebug|x86.ActiveCfg = FuzzerDebug|x64
 		{675B59F8-089E-40B5-8388-56254447CFA3}.FuzzerDebug|x86.Build.0 = FuzzerDebug|x64
 		{675B59F8-089E-40B5-8388-56254447CFA3}.FuzzerDebug|x86.Deploy.0 = FuzzerDebug|x64
@@ -355,6 +357,7 @@ Global
 		{26E7ED0B-C128-4D7C-A90E-C246DEF40AD3}.FuzzerDebug|ARM64.ActiveCfg = FuzzerDebug|ARM64
 		{26E7ED0B-C128-4D7C-A90E-C246DEF40AD3}.FuzzerDebug|ARM64.Build.0 = FuzzerDebug|ARM64
 		{26E7ED0B-C128-4D7C-A90E-C246DEF40AD3}.FuzzerDebug|x64.ActiveCfg = FuzzerDebug|x64
+		{26E7ED0B-C128-4D7C-A90E-C246DEF40AD3}.FuzzerDebug|x64.Build.0 = FuzzerDebug|x64
 		{26E7ED0B-C128-4D7C-A90E-C246DEF40AD3}.FuzzerDebug|x86.ActiveCfg = FuzzerDebug|x64
 		{26E7ED0B-C128-4D7C-A90E-C246DEF40AD3}.FuzzerDebug|x86.Build.0 = FuzzerDebug|x64
 		{26E7ED0B-C128-4D7C-A90E-C246DEF40AD3}.FuzzerDebug|x86.Deploy.0 = FuzzerDebug|x64
@@ -858,7 +861,8 @@ Global
 		{FC3F9998-4085-4767-8386-5453F07C3AAD}.FuzzerDebug|ARM64.ActiveCfg = Debug|ARM64
 		{FC3F9998-4085-4767-8386-5453F07C3AAD}.FuzzerDebug|ARM64.Build.0 = Debug|ARM64
 		{FC3F9998-4085-4767-8386-5453F07C3AAD}.FuzzerDebug|ARM64.Deploy.0 = Debug|ARM64
-		{FC3F9998-4085-4767-8386-5453F07C3AAD}.FuzzerDebug|x64.ActiveCfg = Debug|x64
+		{FC3F9998-4085-4767-8386-5453F07C3AAD}.FuzzerDebug|x64.ActiveCfg = FuzzerDebug|x64
+		{FC3F9998-4085-4767-8386-5453F07C3AAD}.FuzzerDebug|x64.Build.0 = FuzzerDebug|x64
 		{FC3F9998-4085-4767-8386-5453F07C3AAD}.FuzzerDebug|x86.ActiveCfg = Debug|x64
 		{FC3F9998-4085-4767-8386-5453F07C3AAD}.FuzzerDebug|x86.Build.0 = Debug|x64
 		{FC3F9998-4085-4767-8386-5453F07C3AAD}.FuzzerDebug|x86.Deploy.0 = Debug|x64
@@ -2797,48 +2801,6 @@ Global
 		{030A7AC6-14DC-45CF-AF34-891057AB1402}.RelWithDebInfo|x64.Build.0 = Release|x64
 		{030A7AC6-14DC-45CF-AF34-891057AB1402}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
 		{030A7AC6-14DC-45CF-AF34-891057AB1402}.RelWithDebInfo|x86.Build.0 = Release|Win32
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.Debug|ARM64.ActiveCfg = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.Debug|ARM64.Build.0 = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.Debug|x64.ActiveCfg = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.Debug|x64.Build.0 = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.Debug|x86.ActiveCfg = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.Debug|x86.Build.0 = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.FuzzerDebug|ARM64.ActiveCfg = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.FuzzerDebug|ARM64.Build.0 = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.FuzzerDebug|x64.ActiveCfg = FuzzerDebug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.FuzzerDebug|x64.Build.0 = FuzzerDebug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.FuzzerDebug|x86.ActiveCfg = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.FuzzerDebug|x86.Build.0 = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.MinSizeRel|ARM64.ActiveCfg = MinSizeRel|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.MinSizeRel|ARM64.Build.0 = MinSizeRel|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.MinSizeRel|x86.Build.0 = MinSizeRel|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.NativeOnlyDebug|ARM64.ActiveCfg = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.NativeOnlyDebug|ARM64.Build.0 = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.NativeOnlyDebug|x64.ActiveCfg = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.NativeOnlyDebug|x64.Build.0 = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.NativeOnlyDebug|x86.ActiveCfg = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.NativeOnlyDebug|x86.Build.0 = Debug|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.NativeOnlyRelease|ARM64.ActiveCfg = Release|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.NativeOnlyRelease|ARM64.Build.0 = Release|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.NativeOnlyRelease|x64.ActiveCfg = Release|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.NativeOnlyRelease|x64.Build.0 = Release|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.NativeOnlyRelease|x86.ActiveCfg = Release|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.NativeOnlyRelease|x86.Build.0 = Release|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.Release|ARM64.ActiveCfg = Release|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.Release|ARM64.Build.0 = Release|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.Release|x64.ActiveCfg = Release|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.Release|x64.Build.0 = Release|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.Release|x86.ActiveCfg = Release|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.Release|x86.Build.0 = Release|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64
-		{BC45D39C-F956-3951-BD46-44EAE20EC7C9}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x64
 		{249E3FBC-0098-3E3E-80AE-C8F8EF6AB0E5}.Debug|ARM64.ActiveCfg = Debug|x64
 		{249E3FBC-0098-3E3E-80AE-C8F8EF6AB0E5}.Debug|ARM64.Build.0 = Debug|x64
 		{249E3FBC-0098-3E3E-80AE-C8F8EF6AB0E5}.Debug|x64.ActiveCfg = Debug|x64
@@ -2933,9 +2895,9 @@ Global
 		{1FDAD2FD-EBD8-462A-B285-ED5174E55079}.Debug|x86.Deploy.0 = Debug|x64
 		{1FDAD2FD-EBD8-462A-B285-ED5174E55079}.FuzzerDebug|ARM64.ActiveCfg = Debug|ARM64
 		{1FDAD2FD-EBD8-462A-B285-ED5174E55079}.FuzzerDebug|ARM64.Build.0 = Debug|ARM64
-		{1FDAD2FD-EBD8-462A-B285-ED5174E55079}.FuzzerDebug|x64.ActiveCfg = Debug|x64
-		{1FDAD2FD-EBD8-462A-B285-ED5174E55079}.FuzzerDebug|x64.Build.0 = Debug|x64
-		{1FDAD2FD-EBD8-462A-B285-ED5174E55079}.FuzzerDebug|x64.Deploy.0 = Debug|x64
+		{1FDAD2FD-EBD8-462A-B285-ED5174E55079}.FuzzerDebug|x64.ActiveCfg = FuzzerDebug|x64
+		{1FDAD2FD-EBD8-462A-B285-ED5174E55079}.FuzzerDebug|x64.Build.0 = FuzzerDebug|x64
+		{1FDAD2FD-EBD8-462A-B285-ED5174E55079}.FuzzerDebug|x64.Deploy.0 = FuzzerDebug|x64
 		{1FDAD2FD-EBD8-462A-B285-ED5174E55079}.FuzzerDebug|x86.ActiveCfg = Debug|x64
 		{1FDAD2FD-EBD8-462A-B285-ED5174E55079}.FuzzerDebug|x86.Build.0 = Debug|x64
 		{1FDAD2FD-EBD8-462A-B285-ED5174E55079}.FuzzerDebug|x86.Deploy.0 = Debug|x64

diff --git a/ebpfcore/usersim/EbpfCore_Usersim.vcxproj b/ebpfcore/usersim/EbpfCore_Usersim.vcxproj
@@ -9,6 +9,14 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="FuzzerDebug|ARM64">
+      <Configuration>FuzzerDebug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="FuzzerDebug|x64">
+      <Configuration>FuzzerDebug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="NativeOnlyDebug|ARM64">
       <Configuration>NativeOnlyDebug</Configuration>
       <Platform>ARM64</Platform>
@@ -60,6 +68,16 @@
     <Driver_SpectreMitigation>Spectre</Driver_SpectreMitigation>
     <EnableASAN>false</EnableASAN>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FuzzerDebug|x64'" Label="Configuration">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <DriverType>KMDF</DriverType>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <Driver_SpectreMitigation>Spectre</Driver_SpectreMitigation>
+    <EnableASAN>false</EnableASAN>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NativeOnlyDebug|x64'" Label="Configuration">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -101,6 +119,9 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FuzzerDebug|x64'">
+    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NativeOnlyDebug|x64'">
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
   </PropertyGroup>
@@ -153,7 +174,7 @@
     </Midl>
     <Link>
       <AdditionalDependencies>usersim.lib;uuid.lib;bcrypt.lib;legacy_stdio_definitions.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);$(OutDir)..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>ntdll.lib</IgnoreSpecificDefaultLibraries>
     </Link>
     <DriverSign>
@@ -185,7 +206,7 @@
       <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NativeOnlyDebug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='FuzzerDebug|x64'">
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SolutionDir)include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO</PreprocessorDefinitions>
@@ -210,9 +231,35 @@
       <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NativeOnlyDebug|x64'">
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SolutionDir)include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO</PreprocessorDefinitions>
+    </ResourceCompile>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories);$(WindowsSdkDir)Include\10.0.22621.0\km;$(WindowsSdkDir)Include\wdf\kmdf\1.15;$(SolutionDir)include;$(SolutionDir)libs\platform;$(SolutionDir)libs\platform\kernel;$(SolutionDir)libs\execution_context;$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\kernel;$(SolutionDir)resource</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32_WINNT=0x0a00;%(PreprocessorDefinitions);_AMD64_;BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <DisableSpecificWarnings>4324</DisableSpecificWarnings>
+    </ClCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO</PreprocessorDefinitions>
+    </Midl>
+    <Link>
+      <AdditionalDependencies>usersim.lib;uuid.lib;bcrypt.lib;legacy_stdio_definitions.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);$(OutDir)..\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>ntdll.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+    <DriverSign>
+      <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
+    </DriverSign>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\ebpf_drv.c">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USERSIM_DLLMAIN;%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='FuzzerDebug|x64'">USERSIM_DLLMAIN;%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='NativeOnlyDebug|x64'">USERSIM_DLLMAIN;%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='NativeOnlyRelease|x64'">USERSIM_DLLMAIN;%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USERSIM_DLLMAIN;%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO</PreprocessorDefinitions>
@@ -234,7 +281,7 @@
     <ProjectReference Include="..\..\libs\platform\kernel\platform_kernel.vcxproj">
       <Project>{fc3f9998-4085-4767-8386-5453f07c3aad}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\libs\ubpf\kernel\ubpf_kernel.vcxproj">
+    <ProjectReference Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='FuzzerDebug' Or '$(Configuration)'=='Release'" Include="..\..\libs\ubpf\kernel\ubpf_kernel.vcxproj">
       <Project>{675b59f8-089e-40b5-8388-56254447cfa3}</Project>
     </ProjectReference>
   </ItemGroup>
@@ -248,4 +295,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/installer/Product.wxs b/installer/Product.wxs
@@ -222,10 +222,10 @@ SPDX-License-Identifier: MIT
 			     export_program_info.exe requires it.
 			-->
 			<Component Id="USERSIM.DLL" DiskId="1" Guid="{739017F0-9E33-48FF-A33F-C1434AC757BE}">
-				<File Id="USERSIM.DLL" Name="usersim.dll" Source="$(var.SolutionDir)$(var.Platform)\$(var.Configuration)\usersim.dll" />
+				<File Id="USERSIM.DLL" Name="usersim.dll" Source="$(var.usersim.TargetPath)" />
 			</Component>
 			<Component Id="USERSIM.PDB" DiskId="1" Guid="{BCE1BF99-6A3D-48A6-A382-4E87A2B20FB2}">
-				<File Id="USERSIM.PDB" Name="usersim.pdb" Source="$(var.SolutionDir)$(var.Platform)\$(var.Configuration)\usersim.pdb" />
+				<File Id="USERSIM.PDB" Name="usersim.pdb" Source="$(var.usersim.TargetDir)usersim.pdb" />
 			</Component>
 		</ComponentGroup>
 
@@ -802,10 +802,10 @@ SPDX-License-Identifier: MIT
 				<File Id="DROPPACKET_UNSAFE.O" Name="droppacket_unsafe.o" Source="$(var.SolutionDir)$(var.Platform)\$(var.Configuration)\droppacket_unsafe.o" />
 			</Component>
 			<Component Id="EBPFCORE_USERSIM.DLL" DiskId="1" Guid="{860B3D19-02BE-482F-930A-B5B5CFAD2B82}">
-				<File Id="EBPFCORE_USERSIM.DLL" Name="ebpfcore_usersim.dll" Source="$(var.SolutionDir)$(var.Platform)\$(var.Configuration)\ebpfcore_usersim.dll" />
+				<File Id="EBPFCORE_USERSIM.DLL" Name="ebpfcore_usersim.dll" Source="$(var.EbpfCore_Usersim.TargetPath)" />
 			</Component>
 			<Component Id="EBPFCORE_USERSIM.PDB" DiskId="1" Guid="{DD7FB772-A974-4D2C-880A-B17C2F69D063}">
-				<File Id="EBPFCORE_USERSIM.PDB" Name="ebpfcore_usersim.pdb" Source="$(var.SolutionDir)$(var.Platform)\$(var.Configuration)\ebpfcore_usersim.pdb" />
+				<File Id="EBPFCORE_USERSIM.PDB" Name="ebpfcore_usersim.pdb" Source="$(var.EbpfCore_Usersim.TargetDir)ebpfcore_usersim.pdb" />
 			</Component>
 			<?if $(var.Configuration) = Debug ?>
 			<Component Id="EMPTY_UM.DLL" DiskId="1" Guid="{321F2303-53CC-4CF2-8D92-5FCA988BDCB5}">

diff --git a/installer/ebpf-for-windows.wixproj b/installer/ebpf-for-windows.wixproj
@@ -94,6 +94,14 @@ SPDX-License-Identifier: MIT
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
+    <ProjectReference Include="..\external\usersim\src\usersim.vcxproj">
+      <Name>usersim</Name>
+      <Project>{030a7ac6-14dc-45cf-af34-891057ab1402}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\libs\api\api.vcxproj">
       <Name>api</Name>
       <Project>{c8bf60c3-40a9-43ad-891a-8aa34f1c3a68}</Project>