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 74191744250471ec9196373f33a87c3d8d4dd7be..6f20d8a90952ddce0cf054091284054eb7cc8863 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>
@@ -36,9 +35,6 @@
       <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Platform)'=='Win32'">
-    <ArchiveDir>..\..\$(SolutionName)\x86</ArchiveDir>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)'=='x64'">
     <ArchiveDir>..\..\$(SolutionName)\x64</ArchiveDir>
   </PropertyGroup>
@@ -49,7 +45,6 @@
     <FilesToPackage Include="..\xennet.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 53a866286e76ae4b24da811497b599c4ee9d5f4e..3c31b6ca090c3b9027828d0f4764ea97ef98e320 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="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/xennet.sln b/vs2022/xennet.sln
index a73524bcddbbdde338f889f5491954251c4fed08..7107b7128e157585e0f0165ed38dc7d38732593e 100644 (file)
--- a/vs2022/xennet.sln
+++ b/vs2022/xennet.sln
@@ -16,41 +16,23 @@ 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
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 10 Debug|Win32.Deploy.0 = Windows 10 Debug|Win32
                {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
                {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
                {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 10 Debug|x64.Deploy.0 = Windows 10 Debug|x64
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 10 Release|Win32.Deploy.0 = Windows 10 Release|Win32
                {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
                {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
                {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 10 Release|x64.Deploy.0 = Windows 10 Release|x64
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 10 Debug|Win32.Deploy.0 = Windows 10 Debug|Win32
                {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
                {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
                {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 10 Debug|x64.Deploy.0 = Windows 10 Debug|x64
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 10 Release|Win32.Deploy.0 = Windows 10 Release|Win32
                {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
                {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
                {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 10 Release|x64.Deploy.0 = Windows 10 Release|x64

diff --git a/vs2022/xennet/xennet.vcxproj b/vs2022/xennet/xennet.vcxproj
index 5549d9bd76abebbe5a39b9c65d1bfc31bb1be3fd..159b9a5d9432ecfffd5574bdb8afd5a22cd631dc 100644 (file)
--- a/vs2022/xennet/xennet.vcxproj
+++ b/vs2022/xennet/xennet.vcxproj
@@ -41,15 +41,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>