diff --git a/Directory.Build.props b/Directory.Build.props index 5ad1af4..b79c0c3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -29,7 +29,7 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb true - 11.0.4 + 11.0.5 19.5.1 @@ -47,7 +47,7 @@ - + diff --git a/build/_build.csproj b/build/_build.csproj index c5dbd26..d20d17b 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/CrissCross.WPF.WebView2.Test/CrissCross.WPF.WebView2.Test.csproj b/src/CrissCross.WPF.WebView2.Test/CrissCross.WPF.WebView2.Test.csproj index 9ea8355..0106da4 100644 --- a/src/CrissCross.WPF.WebView2.Test/CrissCross.WPF.WebView2.Test.csproj +++ b/src/CrissCross.WPF.WebView2.Test/CrissCross.WPF.WebView2.Test.csproj @@ -8,9 +8,13 @@ false false - + + + + + diff --git a/src/CrissCross.WPF.WebView2.Test/MainWindow.xaml b/src/CrissCross.WPF.WebView2.Test/MainWindow.xaml index 9888259..edae55d 100644 --- a/src/CrissCross.WPF.WebView2.Test/MainWindow.xaml +++ b/src/CrissCross.WPF.WebView2.Test/MainWindow.xaml @@ -12,9 +12,41 @@ mc:Ignorable="d"> - - - + + + + + + + diff --git a/src/CrissCross.WPF.WebView2.Test/MainWindow.xaml.cs b/src/CrissCross.WPF.WebView2.Test/MainWindow.xaml.cs index 0fa8649..8189423 100644 --- a/src/CrissCross.WPF.WebView2.Test/MainWindow.xaml.cs +++ b/src/CrissCross.WPF.WebView2.Test/MainWindow.xaml.cs @@ -10,6 +10,8 @@ namespace CrissCross.WPF.WebView2.Test /// public partial class MainWindow : Window { + private int _clickedXTimes = 1; + /// /// Initializes a new instance of the class. /// @@ -17,5 +19,29 @@ public MainWindow() { InitializeComponent(); } + + private void WindowsXp_Click(object sender, RoutedEventArgs e) + { + Greeting.Text = $"Hello CrissCross {_clickedXTimes++}"; + WebView2Wpf.Source = new System.Uri("https://support.microsoft.com/en-gb/windows/windows-xp-support-has-ended-47b944b8-f4d3-82f2-9acc-21c79ee6ef5e"); + } + + private void Windows7_Click(object sender, RoutedEventArgs e) + { + Greeting.Text = $"Hello CrissCross {_clickedXTimes++}"; + WebView2Wpf.Source = new System.Uri("https://support.microsoft.com/en-us/windows/windows-7-system-requirements-df0900f2-3513-a851-13e7-0d50bc24e15f"); + } + + private void Windows10_Click(object sender, RoutedEventArgs e) + { + Greeting.Text = $"Hello CrissCross {_clickedXTimes++}"; + WebView2Wpf.Source = new System.Uri("https://www.microsoft.com/en-gb/software-download/windows10"); + } + + private void ReactiveUI_Click(object sender, RoutedEventArgs e) + { + Greeting.Text = $"Hello CrissCross {_clickedXTimes++}"; + WebView2Wpf.Source = new System.Uri("https://www.reactiveui.net/"); + } } } diff --git a/src/CrissCross.WPF.WebView2.Test/logo.png b/src/CrissCross.WPF.WebView2.Test/logo.png new file mode 100644 index 0000000..360ee39 Binary files /dev/null and b/src/CrissCross.WPF.WebView2.Test/logo.png differ diff --git a/src/CrissCross.WPF.WebView2.Test/logo1.png b/src/CrissCross.WPF.WebView2.Test/logo1.png new file mode 100644 index 0000000..957819a Binary files /dev/null and b/src/CrissCross.WPF.WebView2.Test/logo1.png differ diff --git a/src/CrissCross.WPF.WebView2.Test/logo2.png b/src/CrissCross.WPF.WebView2.Test/logo2.png new file mode 100644 index 0000000..814b029 Binary files /dev/null and b/src/CrissCross.WPF.WebView2.Test/logo2.png differ diff --git a/src/CrissCross.WPF.WebView2.Test/logo3.png b/src/CrissCross.WPF.WebView2.Test/logo3.png new file mode 100644 index 0000000..feeb26b Binary files /dev/null and b/src/CrissCross.WPF.WebView2.Test/logo3.png differ diff --git a/src/CrissCross.WPF.WebView2/CrissCross.WPF.WebView2.csproj b/src/CrissCross.WPF.WebView2/CrissCross.WPF.WebView2.csproj index fdb0282..b42ae7c 100644 --- a/src/CrissCross.WPF.WebView2/CrissCross.WPF.WebView2.csproj +++ b/src/CrissCross.WPF.WebView2/CrissCross.WPF.WebView2.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/CrissCross.WPF/CrissCross.WPF.csproj b/src/CrissCross.WPF/CrissCross.WPF.csproj index a83dd71..45c4b56 100644 --- a/src/CrissCross.WPF/CrissCross.WPF.csproj +++ b/src/CrissCross.WPF/CrissCross.WPF.csproj @@ -11,7 +11,7 @@ - +