Merge branch 'develop' into user/daspr/kmodsamplefix

3 files changed, 12 insertions, 34 deletions

diff --git a/nfc/NfcCxSample/windows-drivertemplate-nfc.sln b/nfc/NfcCxSample/windows-drivertemplate-nfc.sln
index c2a7a8bf..de2e9097 100644
--- a/nfc/NfcCxSample/windows-drivertemplate-nfc.sln
+++ b/nfc/NfcCxSample/windows-drivertemplate-nfc.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28010.2048
@@ -7,40 +7,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "windows-drivertemplate-nfc"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
 		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|ARM = Release|ARM
 		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E84EF126-888E-4B14-93A3-3B7776036D01}.Debug|ARM.ActiveCfg = Debug|ARM
-		{E84EF126-888E-4B14-93A3-3B7776036D01}.Debug|ARM.Build.0 = Debug|ARM
-		{E84EF126-888E-4B14-93A3-3B7776036D01}.Debug|ARM.Deploy.0 = Debug|ARM
 		{E84EF126-888E-4B14-93A3-3B7776036D01}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{E84EF126-888E-4B14-93A3-3B7776036D01}.Debug|ARM64.Build.0 = Debug|ARM64
 		{E84EF126-888E-4B14-93A3-3B7776036D01}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{E84EF126-888E-4B14-93A3-3B7776036D01}.Debug|x64.ActiveCfg = Debug|x64
 		{E84EF126-888E-4B14-93A3-3B7776036D01}.Debug|x64.Build.0 = Debug|x64
 		{E84EF126-888E-4B14-93A3-3B7776036D01}.Debug|x64.Deploy.0 = Debug|x64
-		{E84EF126-888E-4B14-93A3-3B7776036D01}.Debug|x86.ActiveCfg = Debug|Win32
-		{E84EF126-888E-4B14-93A3-3B7776036D01}.Debug|x86.Build.0 = Debug|Win32
-		{E84EF126-888E-4B14-93A3-3B7776036D01}.Debug|x86.Deploy.0 = Debug|Win32
-		{E84EF126-888E-4B14-93A3-3B7776036D01}.Release|ARM.ActiveCfg = Release|ARM
-		{E84EF126-888E-4B14-93A3-3B7776036D01}.Release|ARM.Build.0 = Release|ARM
-		{E84EF126-888E-4B14-93A3-3B7776036D01}.Release|ARM.Deploy.0 = Release|ARM
 		{E84EF126-888E-4B14-93A3-3B7776036D01}.Release|ARM64.ActiveCfg = Release|ARM64
 		{E84EF126-888E-4B14-93A3-3B7776036D01}.Release|ARM64.Build.0 = Release|ARM64
 		{E84EF126-888E-4B14-93A3-3B7776036D01}.Release|ARM64.Deploy.0 = Release|ARM64
 		{E84EF126-888E-4B14-93A3-3B7776036D01}.Release|x64.ActiveCfg = Release|x64
 		{E84EF126-888E-4B14-93A3-3B7776036D01}.Release|x64.Build.0 = Release|x64
 		{E84EF126-888E-4B14-93A3-3B7776036D01}.Release|x64.Deploy.0 = Release|x64
-		{E84EF126-888E-4B14-93A3-3B7776036D01}.Release|x86.ActiveCfg = Release|Win32
-		{E84EF126-888E-4B14-93A3-3B7776036D01}.Release|x86.Build.0 = Release|Win32
-		{E84EF126-888E-4B14-93A3-3B7776036D01}.Release|x86.Deploy.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.inf b/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.inf
index 5d1afa6e..38d5d022 100644
--- a/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.inf
+++ b/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.inf
diff --git a/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.vcxproj b/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.vcxproj
index ce9fe362..707295b2 100644
--- a/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.vcxproj
+++ b/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.vcxproj
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
@@ -17,14 +9,6 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
@@ -43,7 +27,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <Configuration>Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
+    <Platform Condition="'$(Platform)' == ''">x64</Platform>
     <RootNamespace>windows_drivertemplate_nfc</RootNamespace>
     <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
@@ -78,6 +62,16 @@
     <ClCompile>
       <EnablePREfast>true</EnablePREfast>
     </ClCompile>
+    <DriverSign>
+    </DriverSign>
+    <DriverSign>
+    </DriverSign>
+    <DriverSign>
+      <FileDigestAlgorithm Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">sha256</FileDigestAlgorithm>
+    </DriverSign>
+    <DriverSign>
+      <FileDigestAlgorithm Condition="'$(Configuration)|$(Platform)'=='Release|x64'">sha256</FileDigestAlgorithm>
+    </DriverSign>
   </ItemDefinitionGroup>
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />