From e5795efb4f64be2c7e6ad6a23ac7be6bd2e8d93d Mon Sep 17 00:00:00 2001
From: Stefan Markovic <57057282+stefansjfw@users.noreply.github.com>
Date: Wed, 28 Feb 2024 15:24:40 +0100
Subject: [PATCH] [FE-Addons] Remove --disable-features=RendererAppContainer
 WebView2Environment option (#31613)

* Revert "Add --disable-features=RendererAppContainer WebView2Environment option (#30412)"

This reverts commit 415843f6f4941b3ab3dade189385fae89f83a39e.

* Bump WebView2
---
 Directory.Packages.props                                   | 2 +-
 NOTICE.md                                                  | 2 +-
 .../MarkdownPreviewHandlerControl.cs                       | 2 +-
 .../MonacoPreviewHandler/MonacoPreviewHandlerControl.cs    | 7 ++-----
 .../previewpane/SvgPreviewHandler/SvgPreviewControl.cs     | 2 +-
 .../SvgThumbnailProvider/SvgThumbnailProvider.cs           | 2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index da282caf9f..9e45bacd68 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -36,7 +36,7 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2088.41" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2365.46" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
     <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.1" />
diff --git a/NOTICE.md b/NOTICE.md
index 1f49e08e5a..70dc256751 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1325,7 +1325,7 @@ EXHIBIT A -Mozilla Public License.
 - Microsoft.Extensions.ObjectPool 8.0.0
 - Microsoft.NET.Test.Sdk 17.8.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
-- Microsoft.Web.WebView2 1.0.2088.41
+- Microsoft.Web.WebView2 1.0.2365.46
 - Microsoft.Win32.SystemEvents 8.0.0
 - Microsoft.Windows.Compatibility 8.0.1
 - Microsoft.Windows.CsWin32 0.2.46-beta
diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs
index 01f90c5b2d..06c5c4af3c 100644
--- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs
+++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs
@@ -130,7 +130,7 @@ namespace Microsoft.PowerToys.PreviewHandler.Markdown
                     DefaultBackgroundColor = Color.Transparent,
                 };
 
-                var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents --disable-features=RendererAppContainer");
+                var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents");
                 ConfiguredTaskAwaitable<CoreWebView2Environment>.ConfiguredTaskAwaiter
                         webView2EnvironmentAwaiter = CoreWebView2Environment
                             .CreateAsync(userDataFolder: _webView2UserDataFolder, options: webView2Options)
diff --git a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs
index 1cb591adc3..192395fa31 100644
--- a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs
+++ b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs
@@ -125,13 +125,10 @@ namespace Microsoft.PowerToys.PreviewHandler.Monaco
                     InitializeIndexFileAndSelectedFile(filePath);
 
                     Logger.LogInfo("Create WebView2 environment");
-                    var webView2Options = new CoreWebView2EnvironmentOptions("--disable-features=RendererAppContainer");
                     ConfiguredTaskAwaitable<CoreWebView2Environment>.ConfiguredTaskAwaiter
                         webView2EnvironmentAwaiter = CoreWebView2Environment
-                            .CreateAsync(
-                            userDataFolder: System.Environment.GetEnvironmentVariable("USERPROFILE") +
-                                                "\\AppData\\LocalLow\\Microsoft\\PowerToys\\MonacoPreview-Temp",
-                            options: webView2Options)
+                            .CreateAsync(userDataFolder: System.Environment.GetEnvironmentVariable("USERPROFILE") +
+                                                            "\\AppData\\LocalLow\\Microsoft\\PowerToys\\MonacoPreview-Temp")
                             .ConfigureAwait(true).GetAwaiter();
                     webView2EnvironmentAwaiter.OnCompleted(async () =>
                     {
diff --git a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewControl.cs b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewControl.cs
index d3e63374e4..ca8a169413 100644
--- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewControl.cs
+++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewControl.cs
@@ -225,7 +225,7 @@ namespace Microsoft.PowerToys.PreviewHandler.Svg
             _browser.Dock = DockStyle.Fill;
 
             // Prevent new windows from being opened.
-            var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents --disable-features=RendererAppContainer");
+            var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents");
             ConfiguredTaskAwaitable<CoreWebView2Environment>.ConfiguredTaskAwaiter
                webView2EnvironmentAwaiter = CoreWebView2Environment
                    .CreateAsync(userDataFolder: _webView2UserDataFolder, options: webView2Options)
diff --git a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.cs b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.cs
index e4e636ef26..9916b8f8ed 100644
--- a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.cs
+++ b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.cs
@@ -143,7 +143,7 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Svg
                 thumbnailDone.Set();
             };
 
-            var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents --disable-features=RendererAppContainer");
+            var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents");
             ConfiguredTaskAwaitable<CoreWebView2Environment>.ConfiguredTaskAwaiter
                webView2EnvironmentAwaiter = CoreWebView2Environment
                    .CreateAsync(userDataFolder: _webView2UserDataFolder, options: webView2Options)