From 4341bd666b60659f0abf12eaf00ccf68c76a2493 Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Mon, 8 Jun 2020 16:06:01 -0500
Subject: [PATCH] Just yank this from the manifest till we get a workaround

---
 src/cascadia/CascadiaPackage/Package-Dev.appxmanifest | 5 +++++
 src/cascadia/CascadiaPackage/Package-Pre.appxmanifest | 6 ++++++
 src/cascadia/CascadiaPackage/Package.appxmanifest     | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest b/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest
index 263431693d6..f7f8ed064d0 100644
--- a/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest
+++ b/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest
@@ -82,9 +82,14 @@
                 <desktop5:ItemType Type="Directory">
                     <desktop5:Verb Id="Command1" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
+                <!-- Due to a bug in the OS, this doesn't actually work right -
+                we'll get a nullptr in our implementation. So this is disabled
+                temporarily. See MSFT:24623699 for more details.
+
                 <desktop5:ItemType Type="Directory\Background">
                     <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
+                -->
             </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>
 
diff --git a/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest b/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest
index b004722a60b..ce177cbed51 100644
--- a/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest
+++ b/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest
@@ -82,9 +82,15 @@
                 <desktop5:ItemType Type="Directory">
                     <desktop5:Verb Id="Command1" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
+                <!-- Due to a bug in the OS, this doesn't actually work right -
+                we'll get a nullptr in our implementation. So this is disabled
+                temporarily. See MSFT:24623699 for more details.
+
                 <desktop5:ItemType Type="Directory\Background">
                     <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
+                -->
+
             </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>
 
diff --git a/src/cascadia/CascadiaPackage/Package.appxmanifest b/src/cascadia/CascadiaPackage/Package.appxmanifest
index e6f3a30a0a1..c56165cfe19 100644
--- a/src/cascadia/CascadiaPackage/Package.appxmanifest
+++ b/src/cascadia/CascadiaPackage/Package.appxmanifest
@@ -83,9 +83,14 @@
                 <desktop5:ItemType Type="Directory">
                     <desktop5:Verb Id="Command1" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
+                <!-- Due to a bug in the OS, this doesn't actually work right -
+                we'll get a nullptr in our implementation. So this is disabled
+                temporarily. See MSFT:24623699 for more details.
+
                 <desktop5:ItemType Type="Directory\Background">
                     <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
+                -->
             </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>