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 df5f23af31d1c5dcba183c96c03ca6a11e30d334..63d8dd4a8aeee642d616268ebb67c7e00be23c55 100644 (file)
--- 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 46c4e12e0e36f4d0428d7888b6c88eff5976997d..eb6ca9bbc0c30b93d2357b38359706067bbd4836 100644 (file)
--- 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>
@@ -55,7 +54,6 @@
     <FilesToPackage Include="..\xenvbd.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 7a8768058d35639b786f368ffbddfb5e507074b0..3fcf540afe08b85c7e5ccfb4cb3d23bdee890739 100644 (file)
--- a/vs2022/targets.props
+++ b/vs2022/targets.props
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.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/xencrsh/xencrsh.vcxproj b/vs2022/xencrsh/xencrsh.vcxproj
index 5433a39c1c41ebc3d5e796c4139a378ecd3a782a..20263105475df3dc36f8e8c2aeb902af3af2d29f 100644 (file)
--- a/vs2022/xencrsh/xencrsh.vcxproj
+++ b/vs2022/xencrsh/xencrsh.vcxproj
@@ -41,11 +41,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/xendisk/xendisk.vcxproj b/vs2022/xendisk/xendisk.vcxproj
index 6e714ae747680deab7f8369b107995bdefa6df0a..2fe56f5f1ceeda9806cbba6fcc9c0d599b5dd217 100644 (file)
--- a/vs2022/xendisk/xendisk.vcxproj
+++ b/vs2022/xendisk/xendisk.vcxproj
@@ -39,13 +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>

diff --git a/vs2022/xenvbd.sln b/vs2022/xenvbd.sln
index 2b6a09e817c4dfbcc34bb8d8ec2cf6d791ec4337..407f3953c8ccd1ad01a970d10ed85aa8b275b732 100644 (file)
--- a/vs2022/xenvbd.sln
+++ b/vs2022/xenvbd.sln
@@ -30,54 +30,30 @@ 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
-               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
                {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
                {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
-               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
                {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
                {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
-               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
                {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
                {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
-               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
                {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
                {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
-               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
-               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Debug|Win32.Deploy.0 = Windows 10 Debug|Win32
                {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
                {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
                {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Debug|x64.Deploy.0 = Windows 10 Debug|x64
-               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
-               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Release|Win32.Deploy.0 = Windows 10 Release|Win32
                {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
                {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
                {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Release|x64.Deploy.0 = Windows 10 Release|x64
-               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
                {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
                {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
-               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
                {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
                {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
        EndGlobalSection

diff --git a/vs2022/xenvbd/xenvbd.vcxproj b/vs2022/xenvbd/xenvbd.vcxproj
index 470d16d7036d6dd0912392da5d7b5a16feff619a..6d516306a8620cd313c8988c69dc9de64252802c 100644 (file)
--- a/vs2022/xenvbd/xenvbd.vcxproj
+++ b/vs2022/xenvbd/xenvbd.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>