Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Commit 16ff644

Browse files
Merge pull request #274 from windows-toolkit/webview2-update-link
Update WebView2 Link provided by Edge team
2 parents 4e28a81 + 2029cd2 commit 16ff644

File tree

6 files changed

+9
-3
lines changed

6 files changed

+9
-3
lines changed

Microsoft.Toolkit.Forms.UI.Controls.WebView/WebView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace Microsoft.Toolkit.Forms.UI.Controls
3434
[Description("Embeds a view into your application that renders web content using the Microsoft Edge rendering engine")]
3535
[SecurityCritical]
3636
[PermissionSet(SecurityAction.InheritanceDemand, Name = Constants.SecurityPermissionSetName)]
37-
[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")]
37+
[Obsolete("The WebView control will be replaced by WebView2 in the future. Read more at https://aka.ms/webview2")]
3838
public sealed partial class WebView : Control, IWebView, ISupportInitialize
3939
{
4040
private string _delayedEnterpriseId = WebViewDefaults.EnterpriseId;

Microsoft.Toolkit.Forms.UI.Controls.WebView/WebViewCompatible.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ namespace Microsoft.Toolkit.Forms.UI.Controls
1515
[DefaultEvent(Constants.ComponentDefaultEvent)]
1616
[Docking(DockingBehavior.AutoDock)]
1717
[Description("Embeds a view into your application that renders web content using the a rendering engine")]
18+
[Obsolete("The WebViewCompatible control will be replaced by WebView2 in the future. Read more at https://aka.ms/webview2")]
1819
public class WebViewCompatible : Control, IWebViewCompatible
1920
{
2021
private readonly IWebViewCompatibleAdapter _implementation;

Microsoft.Toolkit.Sample.Forms.App/Form1.Designer.cs

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Microsoft.Toolkit.Wpf.UI.Controls.WebView/WebView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace Microsoft.Toolkit.Wpf.UI.Controls
4949
/// <seealso cref="IWebView" />
5050
[ToolboxItem(true)]
5151
[DesignTimeVisible(true)]
52-
[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")]
52+
[Obsolete("The WebView control will be replaced by WebView2 in the future. Read more at https://aka.ms/webview2")]
5353
public sealed partial class WebView : WebViewHost, IWebView, IWebViewCompatible
5454
{
5555
private static readonly DependencyProperty EnterpriseIdProperty = DependencyProperty.Register(

Microsoft.Toolkit.Wpf.UI.Controls.WebView/WebViewCompatible.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Microsoft.Toolkit.Wpf.UI.Controls
1313
{
14+
[Obsolete("The WebViewCompatible control will be replaced by WebView2 in the future. Read more at https://aka.ms/webview2")]
1415
public class WebViewCompatible : UserControl, IWebViewCompatible, IDisposable
1516
{
1617
public static DependencyProperty SourceProperty { get; } = DependencyProperty.Register(nameof(Source), typeof(Uri), typeof(WebViewCompatible));

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Want to see the toolkit in action before jumping into the code? Download and pla
3939
## WebView Notice
4040
**New:** _Try out the pre-release preview of WebView2 for .NET [here](https://docs.microsoft.com/en-us/microsoft-edge/webview2/releasenotes#09515-prerelease)._ 🎉🎉🎉
4141

42-
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.
42+
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.
4343

4444
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!
4545

0 commit comments

Comments
 (0)