Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to 0.16.0 #24

Merged
merged 1 commit into from
Apr 26, 2024
Merged

Switch to 0.16.0 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/ebpf_ntos_hooks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions libs/store_helper/user/ebpf_store_helper_um.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion libs/store_helper/user/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions ntosebpfext/sys/ntosebpfext.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion ntosebpfext/sys/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions ntosebpfext/user/ntosebpfext_user.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion ntosebpfext/user/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion scripts/initialize_repo.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup_build/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions scripts/setup_build/setup_build.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
4 changes: 2 additions & 2 deletions tests/ntosebpfext_unit/ntosebpfext_unit.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion tests/ntosebpfext_unit/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions tools/export_program_info/export_program_info.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion tools/export_program_info/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion tools/process_monitor/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions tools/process_monitor/process_monitor.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Loading