Fix build with VS2022 (#1017)

Co-authored-by: Manodasan Wignarajah <mawign@microsoft.com>
microsoft · Oct 11, 2021 · 41beec2 · 41beec2
1 parent 4035ab8
commit 41beec2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/src/Samples/AuthoringDemo/CppConsoleApp/CppConsoleApp.vcxproj b/src/Samples/AuthoringDemo/CppConsoleApp/CppConsoleApp.vcxproj
@@ -34,9 +34,7 @@
   </ItemGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">

diff --git a/src/Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMathComponent.vcxproj b/src/Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMathComponent.vcxproj
@@ -54,9 +54,7 @@
   </ItemGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>

diff --git a/src/cswinrt/code_writers.h b/src/cswinrt/code_writers.h
@@ -4922,7 +4922,6 @@ IInspectableVftbl = global::WinRT.IInspectable.Vftbl.AbiToProjectionVftable,
         XLANG_ASSERT(get_category(type) == category::interface_type);
         auto type_name = write_type_name_temp(w, type, "%", typedef_name_type::CCW);
 
-        uint32_t const vtable_base = type.MethodList().first.index();
         w.write(R"(%%
 %% interface %%
 {%