Merge pull request #274 from windows-toolkit/webview2-update-link

Update WebView2 Link provided by Edge team
CommunityToolkit · Jun 5, 2020 · 16ff644 · 16ff644
2 parents 4e28a81 + 2029cd2
commit 16ff644
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/Microsoft.Toolkit.Forms.UI.Controls.WebView/WebView.cs b/Microsoft.Toolkit.Forms.UI.Controls.WebView/WebView.cs
@@ -34,7 +34,7 @@ namespace Microsoft.Toolkit.Forms.UI.Controls
     [Description("Embeds a view into your application that renders web content using the Microsoft Edge rendering engine")]
     [SecurityCritical]
     [PermissionSet(SecurityAction.InheritanceDemand, Name = Constants.SecurityPermissionSetName)]
-    [Obsolete("The WebView control will be replaced by WebView2 in the future. Read more here to provide early feedback: https://docs.microsoft.com/en-us/microsoft-edge/hosting/webview2")]
+    [Obsolete("The WebView control will be replaced by WebView2 in the future. Read more at https://aka.ms/webview2")]
     public sealed partial class WebView : Control, IWebView, ISupportInitialize
     {
         private string _delayedEnterpriseId = WebViewDefaults.EnterpriseId;

diff --git a/Microsoft.Toolkit.Forms.UI.Controls.WebView/WebViewCompatible.cs b/Microsoft.Toolkit.Forms.UI.Controls.WebView/WebViewCompatible.cs
@@ -15,6 +15,7 @@ namespace Microsoft.Toolkit.Forms.UI.Controls
     [DefaultEvent(Constants.ComponentDefaultEvent)]
     [Docking(DockingBehavior.AutoDock)]
     [Description("Embeds a view into your application that renders web content using the a rendering engine")]
+    [Obsolete("The WebViewCompatible control will be replaced by WebView2 in the future. Read more at https://aka.ms/webview2")]
     public class WebViewCompatible : Control, IWebViewCompatible
     {
         private readonly IWebViewCompatibleAdapter _implementation;

diff --git a/Microsoft.Toolkit.Sample.Forms.App/Form1.Designer.cs b/Microsoft.Toolkit.Sample.Forms.App/Form1.Designer.cs
diff --git a/Microsoft.Toolkit.Wpf.UI.Controls.WebView/WebView.cs b/Microsoft.Toolkit.Wpf.UI.Controls.WebView/WebView.cs
@@ -49,7 +49,7 @@ namespace Microsoft.Toolkit.Wpf.UI.Controls
     /// <seealso cref="IWebView" />
     [ToolboxItem(true)]
     [DesignTimeVisible(true)]
-    [Obsolete("The WebView control will be replaced by WebView2 in the future. Read more here to provide early feedback: https://docs.microsoft.com/en-us/microsoft-edge/hosting/webview2")]
+    [Obsolete("The WebView control will be replaced by WebView2 in the future. Read more at https://aka.ms/webview2")]
     public sealed partial class WebView : WebViewHost, IWebView, IWebViewCompatible
     {
         private static readonly DependencyProperty EnterpriseIdProperty = DependencyProperty.Register(

diff --git a/Microsoft.Toolkit.Wpf.UI.Controls.WebView/WebViewCompatible.cs b/Microsoft.Toolkit.Wpf.UI.Controls.WebView/WebViewCompatible.cs
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Toolkit.Wpf.UI.Controls
 {
+    [Obsolete("The WebViewCompatible control will be replaced by WebView2 in the future. Read more at https://aka.ms/webview2")]
     public class WebViewCompatible : UserControl, IWebViewCompatible, IDisposable
     {
         public static DependencyProperty SourceProperty { get; } = DependencyProperty.Register(nameof(Source), typeof(Uri), typeof(WebViewCompatible));

diff --git a/readme.md b/readme.md
@@ -39,7 +39,7 @@ Want to see the toolkit in action before jumping into the code? Download and pla
 ## WebView Notice
 **New:** _Try out the pre-release preview of WebView2 for .NET [here](https://docs.microsoft.com/en-us/microsoft-edge/webview2/releasenotes#09515-prerelease)._ 🎉🎉🎉
 
-WebView2 will replace the WebView control in the toolkit, as laid out in the introduction to [WebView2 here](https://docs.microsoft.com/en-us/microsoft-edge/hosting/webview2). This means that we've deprecated the WebView control within the Toolkit and are working with the Edge team to convey all the requirements from the open issues here.
+WebView2 will replace the WebView control in the toolkit, as laid out in the introduction to [WebView2 here](https://aka.ms/WebView2). This means that we've deprecated the WebView control within the Toolkit and are working with the Edge team to convey all the requirements from the open issues here.
 
 Over the next few months, they'll be processing the open requests to ensure the scenarios folks are using WebView for will be supported with its replacement in the future. You can provide feedback directly to the Edge team [here](https://github.com/MicrosoftEdge/WebViewFeedback). Thank you for using WebView!