Switch to 0.16.0

Signed-off-by: Alan Jowett <[email protected]>
microsoft · Apr 26, 2024 · dbccd5a · dbccd5a
1 parent 92edf14
commit dbccd5a
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 23 deletions.
diff --git a/include/ebpf_ntos_hooks.h b/include/ebpf_ntos_hooks.h
@@ -42,7 +42,7 @@ process_hook_t(process_md_t* context);
 // Process helper functions.
 #define PROCESS_EXT_HELPER_FN_BASE 0xFFFF
 
-#ifndef __doxygen
+#if !defined(__doxygen) && !defined(EBPF_HELPER)
 #define EBPF_HELPER(return_type, name, args) typedef return_type(*name##_t) args
 #endif
 

diff --git a/libs/store_helper/user/ebpf_store_helper_um.vcxproj b/libs/store_helper/user/ebpf_store_helper_um.vcxproj
@@ -4,7 +4,7 @@
   SPDX-License-Identifier: MIT
 -->
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props" Condition="Exists('..\..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" />
+  <Import Project="..\..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props" Condition="Exists('..\..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -137,6 +137,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props'))" />
   </Target>
 </Project>
diff --git a/libs/store_helper/user/packages.config b/libs/store_helper/user/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="eBPF-for-Windows" version="0.15.1" targetFramework="native" />
+  <package id="eBPF-for-Windows" version="0.16.0" targetFramework="native" />
 </packages>
diff --git a/ntosebpfext/sys/ntosebpfext.vcxproj b/ntosebpfext/sys/ntosebpfext.vcxproj
@@ -4,7 +4,7 @@
   SPDX-License-Identifier: MIT
 -->
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props" Condition="Exists('..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" />
+  <Import Project="..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props" Condition="Exists('..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -241,6 +241,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props'))" />
+    <Error Condition="!Exists('..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props'))" />
   </Target>
 </Project>
diff --git a/ntosebpfext/sys/packages.config b/ntosebpfext/sys/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="eBPF-for-Windows" version="0.15.1" targetFramework="native" />
+  <package id="eBPF-for-Windows" version="0.16.0" targetFramework="native" />
 </packages>
diff --git a/ntosebpfext/user/ntosebpfext_user.vcxproj b/ntosebpfext/user/ntosebpfext_user.vcxproj
@@ -4,7 +4,7 @@
   SPDX-License-Identifier: MIT
 -->
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props" Condition="Exists('..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" />
+  <Import Project="..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props" Condition="Exists('..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -154,6 +154,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props'))" />
+    <Error Condition="!Exists('..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props'))" />
   </Target>
 </Project>
diff --git a/ntosebpfext/user/packages.config b/ntosebpfext/user/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="eBPF-for-Windows" version="0.15.1" targetFramework="native" />
+  <package id="eBPF-for-Windows" version="0.16.0" targetFramework="native" />
 </packages>
diff --git a/scripts/initialize_repo.ps1 b/scripts/initialize_repo.ps1
@@ -6,7 +6,7 @@ $commands = @(
     "git submodule update --init --recursive",
     "cmake -G 'Visual Studio 17 2022' -S external\catch2 -B external\catch2\build -DBUILD_TESTING=OFF",
     "nuget restore ntosebpfext.sln",
-    "packages\eBPF-for-Windows.0.15.1\build\native\bin\export_program_info.exe"
+    "packages\eBPF-for-Windows.0.16.0\build\native\bin\export_program_info.exe"
 )
 
 # Loop through each command and run them sequentially without opening a new window

diff --git a/scripts/setup_build/packages.config b/scripts/setup_build/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="eBPF-for-Windows" version="0.15.1" targetFramework="native" />
+  <package id="eBPF-for-Windows" version="0.16.0" targetFramework="native" />
 </packages>
diff --git a/scripts/setup_build/setup_build.vcxproj b/scripts/setup_build/setup_build.vcxproj
@@ -4,7 +4,7 @@
   SPDX-License-Identifier: MIT
 -->
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props" Condition="Exists('..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" />
+  <Import Project="..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props" Condition="Exists('..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -228,6 +228,6 @@ copy "$(VC_CppRuntimeFilesPath_x64)\Microsoft.VC143.CRT" "$(OutDir)"</Command>
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props'))" />
+    <Error Condition="!Exists('..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props'))" />
   </Target>
 </Project>
diff --git a/tests/ntosebpfext_unit/ntosebpfext_unit.vcxproj b/tests/ntosebpfext_unit/ntosebpfext_unit.vcxproj
@@ -4,7 +4,7 @@
   SPDX-License-Identifier: MIT
 -->
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props" Condition="Exists('..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" />
+  <Import Project="..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props" Condition="Exists('..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -149,6 +149,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props'))" />
+    <Error Condition="!Exists('..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props'))" />
   </Target>
 </Project>
diff --git a/tests/ntosebpfext_unit/packages.config b/tests/ntosebpfext_unit/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="eBPF-for-Windows" version="0.15.1" targetFramework="native" />
+  <package id="eBPF-for-Windows" version="0.16.0" targetFramework="native" />
 </packages>
diff --git a/tools/export_program_info/export_program_info.vcxproj b/tools/export_program_info/export_program_info.vcxproj
@@ -4,7 +4,7 @@
   SPDX-License-Identifier: MIT
 -->
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props" Condition="Exists('$(SolutionDir)\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" />
+  <Import Project="$(SolutionDir)\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props" Condition="Exists('$(SolutionDir)\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -215,6 +215,6 @@ $(OutDir)ntos_ebpf_ext_export_program_info.exe</Command>
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props'))" />
   </Target>
 </Project>
diff --git a/tools/export_program_info/packages.config b/tools/export_program_info/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="eBPF-for-Windows" version="0.15.1" targetFramework="native" />
+  <package id="eBPF-for-Windows" version="0.16.0" targetFramework="native" />
 </packages>
diff --git a/tools/process_monitor/packages.config b/tools/process_monitor/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="eBPF-for-Windows" version="0.15.1" targetFramework="native" />
+  <package id="eBPF-for-Windows" version="0.16.0" targetFramework="native" />
 </packages>
diff --git a/tools/process_monitor/process_monitor.vcxproj b/tools/process_monitor/process_monitor.vcxproj
@@ -4,7 +4,7 @@
   SPDX-License-Identifier: MIT
 -->
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props" Condition="Exists('$(SolutionDir)\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" />
+  <Import Project="$(SolutionDir)\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props" Condition="Exists('$(SolutionDir)\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -174,6 +174,6 @@ $(Outdir)ntos_ebpf_ext_export_program_info.exe</Command>
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\eBPF-for-Windows.0.15.1\build\native\ebpf-for-windows.props'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\eBPF-for-Windows.0.16.0\build\native\ebpf-for-windows.props'))" />
   </Target>
 </Project>