From 5a8ac53508e65c4d672b6c6681ede43c4ad114ff Mon Sep 17 00:00:00 2001
From: Charles Milette <charles.milette@gmail.com>
Date: Wed, 25 Aug 2021 01:05:00 -0400
Subject: [PATCH 1/2] Make cppwinrt build on VS 2022

---
 cppwinrt.props | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cppwinrt.props b/cppwinrt.props
index b313ffd04..7e1b5a0a9 100644
--- a/cppwinrt.props
+++ b/cppwinrt.props
@@ -12,6 +12,11 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'">
+    <PlatformToolset>v143</PlatformToolset>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+
   <!--
     Can be used as follows.
 

From b3ede41c5f3f71a4815d2a6107f377caa6574bd0 Mon Sep 17 00:00:00 2001
From: Charles Milette <charles.milette@gmail.com>
Date: Wed, 25 Aug 2021 01:20:49 -0400
Subject: [PATCH 2/2] Ignore errors during manual unregistration

Fixes #1003
---
 cppwinrt/code_writers.h                    | 14 +++++++++++++-
 test/old_tests/UnitTests/event_consume.cpp |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/cppwinrt/code_writers.h b/cppwinrt/code_writers.h
index df4d66564..42cd1852a 100644
--- a/cppwinrt/code_writers.h
+++ b/cppwinrt/code_writers.h
@@ -1120,11 +1120,23 @@ namespace cppwinrt
 
         if (is_noexcept(method))
         {
-            format = R"(    template <typename D%> WINRT_IMPL_AUTO(%) consume_%<D%>::%(%) const noexcept
+            if (is_remove_overload(method))
+            {
+                // we intentionally ignore errors when unregistering event handlers to be consistent with event_revoker
+                format = R"(    template <typename D%> WINRT_IMPL_AUTO(%) consume_%<D%>::%(%) const noexcept
+    {%
+        WINRT_IMPL_SHIM(%)->%(%);%
+    }
+)";
+            }
+            else
+            {
+                format = R"(    template <typename D%> WINRT_IMPL_AUTO(%) consume_%<D%>::%(%) const noexcept
     {%
         WINRT_VERIFY_(0, WINRT_IMPL_SHIM(%)->%(%));%
     }
 )";
+            }
         }
         else
         {
diff --git a/test/old_tests/UnitTests/event_consume.cpp b/test/old_tests/UnitTests/event_consume.cpp
index df01047f7..de6968a3f 100644
--- a/test/old_tests/UnitTests/event_consume.cpp
+++ b/test/old_tests/UnitTests/event_consume.cpp
@@ -37,6 +37,8 @@ struct TestSplashScreen : implements<TestSplashScreen, ISplashScreen>
     void Dismissed(event_token cookie)
     {
         m_dismissed.remove(cookie);
+
+        throw hresult_error(0x80010108); // this exception should always be ignored.
     }
 };
 
@@ -61,6 +63,8 @@ struct TestClipboardStatics : implements<TestClipboardStatics, IClipboardStatics
     void ContentChanged(event_token token)
     {
         m_contentChanged.remove(token);
+        
+        throw hresult_error(0x80010108); // this exception should always be ignored.
     }
 };