From dbcf290e9cb011cfcf5f2d0b0ebce97cb53f4e4d Mon Sep 17 00:00:00 2001
From: Ujjwal Chadha <66971578+ujjwalchadha@users.noreply.github.com>
Date: Thu, 10 Jun 2021 20:15:48 -0400
Subject: [PATCH] Fixed special cased event source (#866)

---
 .../AuthoringWinUITest (Package).assets.cache   | Bin 0 -> 20605 bytes
 src/cswinrt/code_writers.h                      |   7 +++----
 2 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).assets.cache

diff --git a/src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).assets.cache b/src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).assets.cache
new file mode 100644
index 0000000000000000000000000000000000000000..9169029228cab47138d38773545d0c68acf5e7e6
GIT binary patch
literal 20605
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

literal 0
HcmV?d00001

diff --git a/src/cswinrt/code_writers.h b/src/cswinrt/code_writers.h
index cbe357e98..0c4dff66e 100644
--- a/src/cswinrt/code_writers.h
+++ b/src/cswinrt/code_writers.h
@@ -2529,11 +2529,10 @@ db_path.stem().string());
     {
         if (for_typedef(w, get_type_semantics(evt.EventType()), [&](TypeDef const& eventType)
             {
-                if (eventType.TypeNamespace() == "System" && eventType.TypeName() == "EventHandler`1")
+                if ((eventType.TypeNamespace() == "Windows.Foundation" || eventType.TypeNamespace() == "System") && eventType.TypeName() == "EventHandler`1")
                 {
                     auto [add, remove] = get_event_methods(evt);
-                    w.write(R"(
-new EventSource__EventHandler%(_obj,
+                    w.write(R"( new EventSource__EventHandler%(_obj,
 %,
 %))",
 bind<write_type_params>(eventType),
@@ -6458,7 +6457,7 @@ bind<write_type_name>(type, typedef_name_type::CCW, true)
     {
         for_typedef(w, eventTypeSemantics, [&](TypeDef const& eventType)
             {
-                if (eventType.TypeNamespace() == "System" && eventType.TypeName() == "EventHandler`1")
+                if ((eventType.TypeNamespace() == "Windows.Foundation" || eventType.TypeNamespace() == "System") && eventType.TypeName() == "EventHandler`1")
                 {
                     return;
                 }