From: Owen Smith <owen.smith@cloud.com>
Date: Mon, 20 Nov 2023 14:44:45 +0000 (+0000)
Subject: Remove "Win32" as a build target from VS2022 projects
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4b5a478f1ef396421c7ac24bf3acc3a0dd593590;p=pvdrivers%2Fwin%2Fxeniface.git

Remove "Win32" as a build target from VS2022 projects

VS2022 is used with EWDK 22621 and later. Win32 is no longer a valid build
target for this set of tools.

Signed-off-by: Owen Smith <owen.smith@cloud.com>
---

diff --git a/vs2022/configs.props b/vs2022/configs.props
index df5f23a..63d8dd4 100644
--- a/vs2022/configs.props
+++ b/vs2022/configs.props
@@ -1,16 +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="Windows 10 Debug|Win32">
-			<Configuration>Windows 10 Debug</Configuration>
-			<Platform>Win32</Platform>
-			<WindowsTargetPlatformVersion>10</WindowsTargetPlatformVersion>
-		</ProjectConfiguration>
-		<ProjectConfiguration Include="Windows 10 Release|Win32">
-			<Configuration>Windows 10 Release</Configuration>
-			<Platform>Win32</Platform>
-			<WindowsTargetPlatformVersion>10</WindowsTargetPlatformVersion>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Windows 10 Debug|x64">
 			<Configuration>Windows 10 Debug</Configuration>
 			<Platform>x64</Platform>
diff --git a/vs2022/package/package.vcxproj b/vs2022/package/package.vcxproj
index 4c4efae..268a098 100644
--- a/vs2022/package/package.vcxproj
+++ b/vs2022/package/package.vcxproj
@@ -18,7 +18,6 @@
   <PropertyGroup>
     <EnableInf2cat>true</EnableInf2cat>
     <Inf2CatWindowsVersionList Condition="'$(Platform)'=='x64'">10_x64;Server10_x64;ServerRS5_X64;ServerFE_X64;10_CO_X64</Inf2CatWindowsVersionList>
-    <Inf2CatWindowsVersionList Condition="'$(Platform)'=='Win32'">10_x86</Inf2CatWindowsVersionList>
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
     <EnableDeployment>False</EnableDeployment>
     <ImportToStore>False</ImportToStore>
@@ -37,9 +36,6 @@
       <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Platform)'=='Win32'">
-    <ArchiveDir>..\..\$(SolutionName)\x86</ArchiveDir>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)'=='x64'">
     <ArchiveDir>..\..\$(SolutionName)\x64</ArchiveDir>
   </PropertyGroup>
@@ -56,7 +52,6 @@
     <FilesToPackage Include="..\xeniface.inf" />
   </ItemGroup>
   <ItemGroup Condition="Exists('$(DPINST_REDIST)')">
-    <FilesToPackage Include="$(DPINST_REDIST)\x86\dpinst.exe" Condition="'$(Platform)'=='Win32'" />
     <FilesToPackage Include="$(DPINST_REDIST)\x64\dpinst.exe" Condition="'$(Platform)'=='x64'" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/vs2022/targets.props b/vs2022/targets.props
index 53a8662..3c31b6c 100644
--- a/vs2022/targets.props
+++ b/vs2022/targets.props
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 10 Debug|Win32'">
-		<TargetVersion>Windows10</TargetVersion>
-		<UseDebugLibraries>true</UseDebugLibraries>
-	</PropertyGroup>
-	<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 10 Release|Win32'">
-		<TargetVersion>Windows10</TargetVersion>
-		<UseDebugLibraries>false</UseDebugLibraries>
-	</PropertyGroup>
 	<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 10 Debug|x64'">
 		<TargetVersion>Windows10</TargetVersion>
 		<UseDebugLibraries>true</UseDebugLibraries>
diff --git a/vs2022/xenagent/xenagent.vcxproj b/vs2022/xenagent/xenagent.vcxproj
index 02b7b65..dedd1d2 100644
--- a/vs2022/xenagent/xenagent.vcxproj
+++ b/vs2022/xenagent/xenagent.vcxproj
@@ -44,16 +44,6 @@
       <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <CustomBuildStep>
-      <Outputs>$(TargetDir)$(TargetName).dll</Outputs>
-      <Inputs>$(IntDir)$(TargetName).res</Inputs>
-      <Command>link -machine:x86 -dll -noentry -out:%(Outputs) %(Inputs)</Command>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
     <ClCompile>
       <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/vs2022/xencontrol/xencontrol.vcxproj b/vs2022/xencontrol/xencontrol.vcxproj
index 5474ceb..c6ea3ed 100644
--- a/vs2022/xencontrol/xencontrol.vcxproj
+++ b/vs2022/xencontrol/xencontrol.vcxproj
@@ -43,11 +43,6 @@
       <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
     <ClCompile>
       <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/vs2022/xeniface.sln b/vs2022/xeniface.sln
index 7ecb6b3..ac74a35 100644
--- a/vs2022/xeniface.sln
+++ b/vs2022/xeniface.sln
@@ -29,65 +29,35 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "package\package.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Windows 10 Debug|Win32 = Windows 10 Debug|Win32
 		Windows 10 Debug|x64 = Windows 10 Debug|x64
-		Windows 10 Release|Win32 = Windows 10 Release|Win32
 		Windows 10 Release|x64 = Windows 10 Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-		{65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
 		{65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
 		{65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
-		{65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-		{65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
 		{65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
 		{65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
-		{22166290-65D8-49D2-BB88-33201797C7D8}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-		{22166290-65D8-49D2-BB88-33201797C7D8}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
-		{22166290-65D8-49D2-BB88-33201797C7D8}.Windows 10 Debug|Win32.Deploy.0 = Windows 10 Debug|Win32
 		{22166290-65D8-49D2-BB88-33201797C7D8}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
 		{22166290-65D8-49D2-BB88-33201797C7D8}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
 		{22166290-65D8-49D2-BB88-33201797C7D8}.Windows 10 Debug|x64.Deploy.0 = Windows 10 Debug|x64
-		{22166290-65D8-49D2-BB88-33201797C7D8}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-		{22166290-65D8-49D2-BB88-33201797C7D8}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
-		{22166290-65D8-49D2-BB88-33201797C7D8}.Windows 10 Release|Win32.Deploy.0 = Windows 10 Release|Win32
 		{22166290-65D8-49D2-BB88-33201797C7D8}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
 		{22166290-65D8-49D2-BB88-33201797C7D8}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
 		{22166290-65D8-49D2-BB88-33201797C7D8}.Windows 10 Release|x64.Deploy.0 = Windows 10 Release|x64
-		{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-		{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
-		{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}.Windows 10 Debug|Win32.Deploy.0 = Windows 10 Debug|Win32
 		{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
 		{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
 		{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}.Windows 10 Debug|x64.Deploy.0 = Windows 10 Debug|x64
-		{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-		{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
-		{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}.Windows 10 Release|Win32.Deploy.0 = Windows 10 Release|Win32
 		{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
 		{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
 		{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}.Windows 10 Release|x64.Deploy.0 = Windows 10 Release|x64
-		{9B071A35-897C-477A-AEB7-95F77618A21D}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-		{9B071A35-897C-477A-AEB7-95F77618A21D}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
-		{9B071A35-897C-477A-AEB7-95F77618A21D}.Windows 10 Debug|Win32.Deploy.0 = Windows 10 Debug|Win32
 		{9B071A35-897C-477A-AEB7-95F77618A21D}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
 		{9B071A35-897C-477A-AEB7-95F77618A21D}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
 		{9B071A35-897C-477A-AEB7-95F77618A21D}.Windows 10 Debug|x64.Deploy.0 = Windows 10 Debug|x64
-		{9B071A35-897C-477A-AEB7-95F77618A21D}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-		{9B071A35-897C-477A-AEB7-95F77618A21D}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
-		{9B071A35-897C-477A-AEB7-95F77618A21D}.Windows 10 Release|Win32.Deploy.0 = Windows 10 Release|Win32
 		{9B071A35-897C-477A-AEB7-95F77618A21D}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
 		{9B071A35-897C-477A-AEB7-95F77618A21D}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
 		{9B071A35-897C-477A-AEB7-95F77618A21D}.Windows 10 Release|x64.Deploy.0 = Windows 10 Release|x64
-		{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-		{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
-		{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}.Windows 10 Debug|Win32.Deploy.0 = Windows 10 Debug|Win32
 		{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
 		{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
 		{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}.Windows 10 Debug|x64.Deploy.0 = Windows 10 Debug|x64
-		{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-		{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
-		{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}.Windows 10 Release|Win32.Deploy.0 = Windows 10 Release|Win32
 		{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
 		{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
 		{D386D8E9-D015-4AD2-A5C2-4F845A803FA2}.Windows 10 Release|x64.Deploy.0 = Windows 10 Release|x64
diff --git a/vs2022/xeniface/xeniface.vcxproj b/vs2022/xeniface/xeniface.vcxproj
index 9b72b69..bcce921 100644
--- a/vs2022/xeniface/xeniface.vcxproj
+++ b/vs2022/xeniface/xeniface.vcxproj
@@ -39,14 +39,6 @@
       <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
     <ClCompile>
       <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>