diff --git a/datapath-windows/Package/package.VcxProj b/datapath-windows/Package/package.VcxProj
index de747eed2..5939a8816 100644
--- a/datapath-windows/Package/package.VcxProj
+++ b/datapath-windows/Package/package.VcxProj
@@ -9,6 +9,10 @@
Win10 Release
x64
+
+ Win10Analyze
+ x64
+
Win8.1 Debug
x64
@@ -71,6 +75,13 @@
WindowsKernelModeDriver$(PlatformToolsetVer)
Desktop
+
+
+ true
+ 10.0
+ WindowsKernelModeDriver$(PlatformToolsetVer)
+ Desktop
+
Windows8
true
@@ -113,6 +124,9 @@
true
+
+ true
+
DbgengKernelDebugger
False
@@ -148,6 +162,11 @@
true
+
+
+ true
+
+
true
@@ -185,4 +204,4 @@
-
+
\ No newline at end of file
diff --git a/datapath-windows/Package/package.VcxProj.user b/datapath-windows/Package/package.VcxProj.user
index 6231d93f7..5b0c53539 100644
--- a/datapath-windows/Package/package.VcxProj.user
+++ b/datapath-windows/Package/package.VcxProj.user
@@ -15,6 +15,9 @@
TestSign
+
+ TestSign
+
TestSign
@@ -24,4 +27,4 @@
TestSign
-
+
\ No newline at end of file
diff --git a/datapath-windows/automake.mk b/datapath-windows/automake.mk
index 3820041f6..b8cf5dd95 100644
--- a/datapath-windows/automake.mk
+++ b/datapath-windows/automake.mk
@@ -3,6 +3,7 @@ EXTRA_DIST += \
datapath-windows/Package/package.VcxProj.user \
datapath-windows/include/OvsDpInterfaceExt.h \
datapath-windows/include/OvsDpInterfaceCtExt.h \
+ datapath-windows/misc/DriverRecommendedRules.ruleset \
datapath-windows/misc/OVS.psm1 \
datapath-windows/misc/install.cmd \
datapath-windows/misc/uninstall.cmd \
@@ -86,5 +87,6 @@ EXTRA_DIST += \
datapath-windows/ovsext/resource.h
datapath_windows_analyze: all
+ MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win10Analyze"
MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1Analyze"
MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8Analyze"
diff --git a/datapath-windows/misc/DriverRecommendedRules.ruleset b/datapath-windows/misc/DriverRecommendedRules.ruleset
new file mode 100644
index 000000000..0faae599c
--- /dev/null
+++ b/datapath-windows/misc/DriverRecommendedRules.ruleset
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/datapath-windows/ovsext.sln b/datapath-windows/ovsext.sln
index 1000104f1..ab006e84f 100644
--- a/datapath-windows/ovsext.sln
+++ b/datapath-windows/ovsext.sln
@@ -12,6 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ovsext", "ovsext\ovsext.vcx
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Win10Analyze|x64 = Win10Analyze|x64
Win10Debug|x64 = Win10Debug|x64
Win10Release|x64 = Win10Release|x64
Win8.1Analyze|x64 = Win8.1Analyze|x64
@@ -22,6 +23,8 @@ Global
Win8Release|x64 = Win8Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Analyze|x64.ActiveCfg = Win10Analyze|x64
+ {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Analyze|x64.Build.0 = Win10Analyze|x64
{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Debug|x64.ActiveCfg = Win10 Debug|x64
{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Debug|x64.Build.0 = Win10 Debug|x64
{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Debug|x64.Deploy.0 = Win10 Debug|x64
@@ -42,6 +45,8 @@ Global
{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Debug|x64.Build.0 = Win8 Debug|x64
{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Release|x64.ActiveCfg = Win8 Release|x64
{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Release|x64.Build.0 = Win8 Release|x64
+ {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Analyze|x64.ActiveCfg = Win10Analyze|x64
+ {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Analyze|x64.Build.0 = Win10Analyze|x64
{63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.ActiveCfg = Win10 Debug|x64
{63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.Build.0 = Win10 Debug|x64
{63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.Deploy.0 = Win10 Debug|x64
diff --git a/datapath-windows/ovsext/ovsext.vcxproj b/datapath-windows/ovsext/ovsext.vcxproj
index 0509b765b..d50a126b4 100644
--- a/datapath-windows/ovsext/ovsext.vcxproj
+++ b/datapath-windows/ovsext/ovsext.vcxproj
@@ -9,6 +9,10 @@
Win10 Release
x64
+
+ Win10Analyze
+ x64
+
Win8.1 Debug
x64
@@ -71,6 +75,13 @@
WindowsKernelModeDriver$(PlatformToolsetVer)
Desktop
+
+
+ True
+ 10.0
+ WindowsKernelModeDriver$(PlatformToolsetVer)
+ Desktop
+
Windows8
True
@@ -131,6 +142,9 @@
+
+
+
@@ -182,11 +196,18 @@
true
+
+ true
+ ..\misc\DriverRecommendedRules.ruleset
+ true
+
true
+ ..\misc\DriverRecommendedRules.ruleset
true
+ ..\misc\DriverRecommendedRules.ruleset
@@ -276,6 +297,17 @@
%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1
+
+
+ %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1
+
+
+ %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1
+
+
+ %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1
+
+
%(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib;$(DDK_LIB_PATH)\netio.lib
@@ -290,6 +322,7 @@
.;$(IntDir);%(AdditionalIncludeDirectories);..\..
.;$(IntDir);%(AdditionalIncludeDirectories);..\..
.;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory)
+ .;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory)
.;$(IntDir);%(AdditionalIncludeDirectories);..\..
.;$(IntDir);%(AdditionalIncludeDirectories);..\..
.;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory)
@@ -299,10 +332,12 @@
true
true
true
+ true
true
true
true
true
+ true
$(Version)
@@ -314,6 +349,7 @@
$(Version)
+ $(Version)
$(Version)
@@ -375,6 +411,7 @@
%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))
%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))
%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))
+ %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))
@@ -387,4 +424,4 @@
-
+
\ No newline at end of file
diff --git a/datapath-windows/ovsext/ovsext.vcxproj.user b/datapath-windows/ovsext/ovsext.vcxproj.user
index 6231d93f7..5b0c53539 100644
--- a/datapath-windows/ovsext/ovsext.vcxproj.user
+++ b/datapath-windows/ovsext/ovsext.vcxproj.user
@@ -15,6 +15,9 @@
TestSign
+
+ TestSign
+
TestSign
@@ -24,4 +27,4 @@
TestSign
-
+
\ No newline at end of file