Leverage win-net-test tools in downlevel tests (#480)

microsoft · Mar 28, 2024 · 57c8ea1 · 57c8ea1
1 parent e382e33
commit 57c8ea1
Show file tree

Hide file tree

Showing 114 changed files with 198 additions and 12,407 deletions.
diff --git a/.azure/scripts/agent-functionaltest/Setup.ps1 b/.azure/scripts/agent-functionaltest/Setup.ps1
@@ -14,7 +14,7 @@ Write-Host "Enable test signing"
 bcdedit.exe /set testsigning on
 
 Write-Host "Enable driver verifier"
-verifier.exe /standard /driver xdp.sys xdpfnmp.sys xdpfnlwf.sys ndis.sys ebpfcore.sys
+verifier.exe /standard /driver xdp.sys fnmp.sys fnlwf.sys ndis.sys ebpfcore.sys
 
 #Write-Host "Enable complete system crash dumps"
 #reg.exe add HKLM\System\CurrentControlSet\Control\CrashControl /v CrashDumpEnabled /d 1 /t REG_DWORD /f
diff --git a/src/xdp.props b/src/xdp.props
@@ -3,10 +3,11 @@
     <!-- Defines the XDP version numbers -->
     <XdpMajorVersion>1</XdpMajorVersion>
     <XdpMinorVersion>0</XdpMinorVersion>
-    <XdpPatchVersion>1</XdpPatchVersion>
+    <XdpPatchVersion>2</XdpPatchVersion>
     <!-- Project-wide properties -->
     <EbpfPackagePath>$(SolutionDir)packages\eBPF-for-Windows.0.9.0\</EbpfPackagePath>
     <WiXPackagePath>$(SolutionDir)packages\wix.3.14.0\</WiXPackagePath>
+    <FnPackagePath>$(SolutionDir)artifacts\fn\devkit-0.4.1\</FnPackagePath>
   </PropertyGroup>
   <!-- The set of (eventually?) supported configurations -->
   <ItemGroup Label="ProjectConfigurations">

diff --git a/test/build_headers/sdk/c/csdkheaders.vcxproj b/test/build_headers/sdk/c/csdkheaders.vcxproj
@@ -13,9 +13,6 @@
     <ProjectReference Include="$(SolutionDir)src\xdpapi\xdpapi.vcxproj">
       <Project>{0ccecb60-0538-4252-8c8e-23a92199cbe0}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)test\pkthlp\um\pkthlp_um.vcxproj">
-      <Project>{e84ff937-7445-4b8e-ba40-dffacc09c060}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>

diff --git a/test/build_headers/sdk/cpp/cppsdkheaders.vcxproj b/test/build_headers/sdk/cpp/cppsdkheaders.vcxproj
@@ -13,9 +13,6 @@
     <ProjectReference Include="$(SolutionDir)src\xdpapi\xdpapi.vcxproj">
       <Project>{0ccecb60-0538-4252-8c8e-23a92199cbe0}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)test\pkthlp\um\pkthlp_um.vcxproj">
-      <Project>{1ec347f7-a95f-49f3-b35f-77443a601f53}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>

diff --git a/test/common/inc/bounce.h b/test/common/inc/bounce.h
diff --git a/test/common/inc/fnio.h b/test/common/inc/fnio.h
diff --git a/test/common/inc/fniotypes.h b/test/common/inc/fniotypes.h
diff --git a/test/common/inc/xdpfnoid.h b/test/common/inc/xdpfnoid.h