From 1bdde092ca6031f86b659212db1fa00bb1d5c9af Mon Sep 17 00:00:00 2001
From: Andrii Kurdiumov <kant2002@gmail.com>
Date: Wed, 13 Jul 2022 09:57:10 +0600
Subject: [PATCH] Fix build in VS2022 (#72)

* Fix build in VS2022
That's improve status after https://github.com/microsoft/TestWinRT/pull/53
and required to fully compliment https://github.com/microsoft/CsWinRT/pull/1217

* Fix MIDL
---
 Console/Console.vcxproj                               | 3 ++-
 TestComponent/TestComponent.idl                       | 2 +-
 TestComponent/TestComponent.vcxproj                   | 3 ++-
 test_component_base/test_component_base.vcxproj       | 3 ++-
 test_component_derived/test_component_derived.vcxproj | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Console/Console.vcxproj b/Console/Console.vcxproj
index 71032f2..107d946 100644
--- a/Console/Console.vcxproj
+++ b/Console/Console.vcxproj
@@ -33,7 +33,8 @@
   </ItemGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
diff --git a/TestComponent/TestComponent.idl b/TestComponent/TestComponent.idl
index 4263506..e921930 100644
--- a/TestComponent/TestComponent.idl
+++ b/TestComponent/TestComponent.idl
@@ -288,7 +288,7 @@ namespace TestComponent
         static Int32 ExpectRequiredFour(IRequiredFour t);
     }
 
-    unsealed runtimeclass Derived : Composable, IRequiredOne, IRequiredTwo, IRequiredThree, IRequiredFour
+    unsealed runtimeclass Derived : Composable
     {
         Derived();
     }
diff --git a/TestComponent/TestComponent.vcxproj b/TestComponent/TestComponent.vcxproj
index a5fa6be..6f2b309 100644
--- a/TestComponent/TestComponent.vcxproj
+++ b/TestComponent/TestComponent.vcxproj
@@ -42,7 +42,8 @@
   </ItemGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
diff --git a/test_component_base/test_component_base.vcxproj b/test_component_base/test_component_base.vcxproj
index 351208a..6d75ffe 100644
--- a/test_component_base/test_component_base.vcxproj
+++ b/test_component_base/test_component_base.vcxproj
@@ -42,7 +42,8 @@
   </ItemGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
diff --git a/test_component_derived/test_component_derived.vcxproj b/test_component_derived/test_component_derived.vcxproj
index 8f35cb5..643fcde 100644
--- a/test_component_derived/test_component_derived.vcxproj
+++ b/test_component_derived/test_component_derived.vcxproj
@@ -45,7 +45,8 @@
 	</ItemGroup>
 	<PropertyGroup Label="Configuration">
 		<ConfigurationType>DynamicLibrary</ConfigurationType>
-		<PlatformToolset>v142</PlatformToolset>
+		<PlatformToolset>v143</PlatformToolset>
+		<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
 		<CharacterSet>Unicode</CharacterSet>
 		<GenerateManifest>false</GenerateManifest>
 	</PropertyGroup>