From 5fb7b0cff005f2262c24ec6b6b7ccf2189b556e2 Mon Sep 17 00:00:00 2001
From: Alexander Sklar <asklar@microsoft.com>
Date: Mon, 28 Mar 2022 10:07:42 -0700
Subject: [PATCH] feat(windows): Add WebView2 UWP Desktop support (#2419)

* feat(windows): Add WebView2 UWP Desktop support

* remove expired cert

* deploy from layout in ci
---
 .github/workflows/windows-ci.yml                 |   4 ++--
 example/app.json                                 |   4 +---
 example/windows/WebViewWindows_TemporaryKey.pfx  | Bin 2520 -> 0 bytes
 .../ReactNativeWebView.vcxproj                   |   1 +
 4 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 example/windows/WebViewWindows_TemporaryKey.pfx

diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
index f9fc44f1b..d56326a0a 100644
--- a/.github/workflows/windows-ci.yml
+++ b/.github/workflows/windows-ci.yml
@@ -42,13 +42,13 @@ jobs:
       run: yarn windows --release --no-packager --no-deploy --logging
 
     # Workaround for a bug in package searching during deploy.
-    # The deploy script only searches windows/{*/bin/x64/Release,Release/*}, but the build step above placed the pakcages at windows/x64/Release.
+    # The deploy script only searches windows/{*/bin/x64/Release,Release/*}, but the build step above placed the packages at windows/x64/Release.
     # Copy the packages to Windows/Release before deploying.
     - name: Deploy
       shell: powershell
       run: |
         Copy-Item -Path example\windows\x64\Release -Recurse -Destination example\windows\
-        npx react-native run-windows --arch x64 --release --root example --logging --no-build --no-packager
+        npx react-native run-windows --arch x64 --release --root example --logging --no-build --no-packager --deploy-from-layout
 
     - name: Start Appium server
       shell: powershell
diff --git a/example/app.json b/example/app.json
index 02f46848f..e9f9c4434 100644
--- a/example/app.json
+++ b/example/app.json
@@ -26,8 +26,6 @@
     ]
   },
   "windows": {
-    "appxManifest": "windows/Package.appxmanifest",
-    "certificateKeyFile": "windows/WebViewWindows_TemporaryKey.pfx",
-    "certificateThumbprint": "1DA6E34911B18C433FE3E543D0429FC808468C89"
+    "appxManifest": "windows/Package.appxmanifest"
   }
 }
diff --git a/example/windows/WebViewWindows_TemporaryKey.pfx b/example/windows/WebViewWindows_TemporaryKey.pfx
deleted file mode 100644
index 6d1279f0f18fce7d0ead815d5a348665bda2d768..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2520
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

diff --git a/windows/ReactNativeWebView/ReactNativeWebView.vcxproj b/windows/ReactNativeWebView/ReactNativeWebView.vcxproj
index d74711f50..5213cc011 100644
--- a/windows/ReactNativeWebView/ReactNativeWebView.vcxproj
+++ b/windows/ReactNativeWebView/ReactNativeWebView.vcxproj
@@ -147,6 +147,7 @@
     <None Include="packages.config" />
     <None Include="ReactNativeWebView.def" />
   </ItemGroup>
+
   <ItemGroup>
     <None Include="PropertySheet.props" />
   </ItemGroup>