From aa40abfc2133a2d82fee2dea2ca6044f36c84015 Mon Sep 17 00:00:00 2001 From: David Shoemaker Date: Tue, 2 Nov 2021 18:03:14 -0700 Subject: [PATCH 1/2] Update main readme to cover the UWP sample and add a missing default.rd.xml for the UWP sample --- README.md | 8 ++--- .../properties/Default.rd.xml | 31 +++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 SampleApps/webview2_sample_uwp/properties/Default.rd.xml diff --git a/README.md b/README.md index 35d6fe25..cfb6c24f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ In the ``GettingStarted`` folder you will find the starter code for its respecti - [WinUI Getting Started](https://docs.microsoft.com/microsoft-edge/webview2/gettingstarted/winui) In the ``Sample Apps`` folder you will find: -- [WebView2Samples.sln](SampleApps/WebView2Samples.sln) - a collective solution that includes [WebView2APISample.vcxproj](SampleApps/WebView2APISample/WebView2APISample.vcxproj), [WebView2SampleWinComp.vcxproj](SampleApps/WebView2SampleWinComp/WebView2SampleWinComp.vcxproj), [WebView2WpfBrowser.csproj](SampleApps/WebView2WpfBrowser/WebView2WpfBrowser.csproj), [WebView2WindowsFormsBrowser.csproj](SampleApps/WebView2WindowsFormsBrowser/WebView2WindowsFormsBrowser.csproj), [WV2DeploymentWiXCustomActionSample](/SampleApps/WV2DeploymentWiXCustomActionSample/README.md), and [WV2DeploymentWiXBurnBundleSample](/SampleApps/WV2DeploymentWiXBurnBundleSample/README.md). +- [WebView2Samples.sln](SampleApps/WebView2Samples.sln) - a collective solution that includes [WebView2APISample.vcxproj](SampleApps/WebView2APISample/WebView2APISample.vcxproj), [WebView2SampleWinComp.vcxproj](SampleApps/WebView2SampleWinComp/WebView2SampleWinComp.vcxproj), [WebView2WpfBrowser.csproj](SampleApps/WebView2WpfBrowser/WebView2WpfBrowser.csproj), [WebView2WindowsFormsBrowser.csproj](SampleApps/WebView2WindowsFormsBrowser/WebView2WindowsFormsBrowser.csproj), [WV2DeploymentWiXCustomActionSample](/SampleApps/WV2DeploymentWiXCustomActionSample/README.md), [WV2DeploymentWiXBurnBundleSample](/SampleApps/WV2DeploymentWiXBurnBundleSample/README.md), and [webview2_sample_uwp](/SampleApps/webview2_sample_uwp/README.md) Please leave feedback in our [our feedback repo](https://aka.ms/webviewfeedback)! @@ -43,11 +43,11 @@ Follow the [WebView2Browser guide](https://github.com/MicrosoftEdge/WebView2Brow * The **WPF Sample** can be found in the [WebView2WpfBrowser](./SampleApps/WebView2WpfBrowser) directory. * The **Windows Forms Sample** can be found in the [WebView2WindowsFormsBrowser](./SampleApps/WebView2WindowsFormsBrowser) directory. -## UWP/WinUI +## UWP/WinUI2 -#### Comprehensive API Sample +#### WebView2 UWP sample +* The "WinUi2 Webview UWP sample can be found int the [webview2_sample_uwp](./SampleApps/webview2_sample_uwp) directory. -The **UWP WinUI Sample** can be found in the [WinUI Controls Gallery](https://github.com/microsoft/Xaml-Controls-Gallery/tree/winui3preview). ## WebView2 Deployment diff --git a/SampleApps/webview2_sample_uwp/properties/Default.rd.xml b/SampleApps/webview2_sample_uwp/properties/Default.rd.xml new file mode 100644 index 00000000..af00722c --- /dev/null +++ b/SampleApps/webview2_sample_uwp/properties/Default.rd.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + \ No newline at end of file From 4824c1d7801508b1e19b3cbad7b4206024d33998 Mon Sep 17 00:00:00 2001 From: David Shoemaker Date: Fri, 19 Nov 2021 14:10:35 -0800 Subject: [PATCH 2/2] Update WinUI 2 name --- .../webview2_sample_uwp/properties/AssemblyInfo.cs | 2 +- SampleApps/webview2_sample_uwp/readme.md | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SampleApps/webview2_sample_uwp/properties/AssemblyInfo.cs b/SampleApps/webview2_sample_uwp/properties/AssemblyInfo.cs index f449244f..54fea74e 100644 --- a/SampleApps/webview2_sample_uwp/properties/AssemblyInfo.cs +++ b/SampleApps/webview2_sample_uwp/properties/AssemblyInfo.cs @@ -24,6 +24,6 @@ [assembly: AssemblyFileVersion("1.0.0.0")] [assembly: ComVisible(false)] [assembly: AssemblyTitleAttribute("webview2_sample_uwp")] -[assembly: AssemblyDescriptionAttribute("A WebView2 WinUI2 UWP test application")] +[assembly: AssemblyDescriptionAttribute("A WebView2 WinUI 2 UWP test application")] [assembly: AssemblyCompanyAttribute("Microsoft")] [assembly: AssemblyCopyrightAttribute("Copyright © Microsoft Inc. 2021")] diff --git a/SampleApps/webview2_sample_uwp/readme.md b/SampleApps/webview2_sample_uwp/readme.md index ed0904a8..2bcface4 100644 --- a/SampleApps/webview2_sample_uwp/readme.md +++ b/SampleApps/webview2_sample_uwp/readme.md @@ -1,5 +1,5 @@ --- -description: "Demonstrate the features and usage patterns of WebView2 running in a UWP application using winui2." +description: "Demonstrate the features and usage patterns of WebView2 running in a UWP application using WinUI 2." extendedZipContent: - path: SharedContent @@ -14,7 +14,7 @@ products: - microsoft-edge urlFragment: WebView2_UWP --- -# WebView2 UWP WinUi2 browser +# WebView2 UWP WinUi 2 browser This is a hybrid application built with the [Microsoft Edge WebView2](https://aka.ms/webview2) control. @@ -33,9 +33,9 @@ To learn more specifics about events and API Handlers in WebView2, you can refer - [Microsoft Edge (Chromium)](https://www.microsoftedgeinsider.com/download/) installed on a supported OS. Currently we recommend the latest version of the Edge Canary channel. - [Visual Studio](https://visualstudio.microsoft.com/vs/) with .NET support installed. - Latest pre-release version of our [WebView2 SDK](https://aka.ms/webviewnuget), which is included in this project. -- Latest pre-release version of the [WinUI2 SDK](https://aka.ms/webviewnuget), which is included in this project +- Latest pre-release version of the [WinUI 2 SDK](https://aka.ms/webviewnuget), which is included in this project -## Build the WebView2 UWP WinUi2 browser +## Build the WebView2 UWP WinUi 2 browser Clone the repository and open the solution in Visual Studio. WebView2 & WebUi2 are already included as a NuGet package* in this project. @@ -46,7 +46,7 @@ Clone the repository and open the solution in Visual Studio. WebView2 & WebUi2 a That's it! Everything should be ready to just launch the app. -*You can get the WebView2 & WinUI2 NugetPackage through the Visual Studio NuGet Package Manager. +*You can get the WebView2 & WinUI 2 NugetPackage through the Visual Studio NuGet Package Manager. ## Code of Conduct