Add usersim.dll to installer files

Signed-off-by: Dave Thaler <[email protected]>
microsoft · Jul 27, 2023 · d388a97 · d388a97
1 parent 3a8a6d8
commit d388a97
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/installer/Product.wxs b/installer/Product.wxs
@@ -218,6 +218,15 @@ SPDX-License-Identifier: MIT
 			<Component Id="EXPORT_PROGRAM_INFO.PDB" DiskId="1" Guid="{88356FE4-6247-4876-BA14-42EDA88CC5C7}">
 				<File Id="EXPORT_PROGRAM_INFO.PDB" Name="export_program_info.pdb" Source="$(var.export_program_info.TargetDir)export_program_info.pdb" />
 			</Component>
+			<!-- TODO(#2677): move usersim.dll down to the testing component.  Until that issue is addressed,
+			     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" />
+			</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" />
+			</Component>
 		</ComponentGroup>
 
 		<!--Clear/Setup the eBPF store-->

diff --git a/scripts/deploy-ebpf.ps1.in b/scripts/deploy-ebpf.ps1.in
@@ -7,6 +7,8 @@
 $source_directory="."
 
 # The following files should be installed on all platforms.
+# TODO(#2677): export_program_info.exe temporarily requires usersim.dll,
+# usersim.dll should get moved down to the test files list.
 [System.Collections.ArrayList]$built_runtime_files=@(
     "bpftool.exe",
     "bpftool.pdb",
@@ -24,7 +26,9 @@ $source_directory="."
     "NetEbpfExt.sys",
     "NetEbpfExt.pdb",
     "net-ebpf-ext.guid",
-    "ucrtbased.dll")
+    "ucrtbased.dll",
+    "usersim.dll",
+    "usersim.pdb")
 
 [System.Collections.ArrayList]$built_runtime_jit_files=@(
     "ebpfsvc.exe",

diff --git a/tools/export_program_info/export_program_info.vcxproj b/tools/export_program_info/export_program_info.vcxproj
@@ -143,6 +143,7 @@ $(OutputPath)export_program_info.exe</Command>
     <CustomBuildStep>
       <Command>cd /d $(OutputPath)
 copy ..\Debug\usersim.dll .
+copy ..\Debug\usersim.pdb .
 $(OutputPath)export_program_info.exe --clear
 $(OutputPath)export_program_info.exe</Command>
     </CustomBuildStep>
@@ -167,6 +168,7 @@ $(OutputPath)export_program_info.exe</Command>
     <CustomBuildStep>
       <Command>cd /d $(OutputPath)
 copy ..\Debug\usersim.dll .
+copy ..\Debug\usersim.pdb .
 $(OutputPath)export_program_info.exe --clear
 $(OutputPath)export_program_info.exe</Command>
     </CustomBuildStep>
@@ -218,6 +220,7 @@ $(OutputPath)export_program_info.exe</Command>
     <CustomBuildStep>
       <Command>cd /d $(OutputPath)
 copy ..\Release\usersim.dll .
+copy ..\Release\usersim.pdb .
 $(OutputPath)export_program_info.exe --clear
 $(OutputPath)export_program_info.exe</Command>
     </CustomBuildStep>

diff --git a/tools/nuget/ebpf-for-windows.nuspec.in b/tools/nuget/ebpf-for-windows.nuspec.in
@@ -28,6 +28,9 @@
 		<file src="ebpfapi.dll" target="build\native\bin"/>
 		<file src="ebpfapi.pdb" target="build\native\bin"/>
 		<file src="ebpfapi.lib" target="build\native\lib"/>
+		<!-- TODO(#2677): export_program_info.exe temporarily requires usersim.dll. -->
+		<file src="usersim.dll" target="build\native\bin"/>
+		<file src="usersim.pdb" target="build\native\bin"/>
 		<file src="..\..\include\**\*.*" target="build\native\include" />
 
 		<!--Cherry-pick files from external projects-->