Anpi/refresh.from.upstream

.github/ISSUE_TEMPLATE/bug_report.md

@@ -30,6 +30,9 @@ Gallery version (found on Settings page):
 
 Windows 10 version:
 - [ ] Insider Build (xxxxx)
+- [ ] May 2020 Update (19041)
+- [ ] November 2019 Update (18363)
+- [ ] May 2019 Update (18362)
 - [ ] October 2018 Update (17763)
 - [ ] April 2018 Update (17134)
 - [ ] Fall Creators Update (16299)
@@ -44,4 +47,4 @@ Device form factor:
 - [ ] IoT
 
 **Additional context**
-<!-- Enter any other applicable info here -->
+<!-- Enter any other applicable info here -->

.gitignore

@@ -217,7 +217,6 @@ ClientBin/
 *.dbmdl
 *.dbproj.schemaview
 *.jfm
-*.pfx
 *.publishsettings
 orleans.codegen.cs
 
@@ -328,3 +327,4 @@ ASALocalRun/
 
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
+/XamlControlsGallery/testcert.pfx

README.md

@@ -1,46 +1,60 @@
 ---
-topic: sample
+page_type: sample
 languages:
-- csharp
+  - csharp
+  - xaml
 products:
-- windows
-- uwp
+  - windows
+  - windows-uwp
+statusNotificationTargets:
+- controlsgallery@microsoft.com 
+description: Demonstrates the usage of all XAML/WinUI controls in an interactive format.
 ---
 
 # XAML Controls Gallery
 
 ![Xaml Gallery Screenshot](README_Images/XamlGalleryLanding.PNG)
 
-Shows all of the XAML controls in an interactive format. This app is the interactive companion to the [Fluent Design Guidelines](https://docs.microsoft.com/en-us/windows/uwp/design/basics/) and shows the usage of both UWP Xaml APIs and [Windows UI Toolkit](https://docs.microsoft.com/en-us/uwp/toolkits/winui/) APIs. 
+[![Build Status](https://dev.azure.com/stmoy/Xaml%20Controls%20Gallery/_apis/build/status/XAML%20Controls%20%20Gallery%20-%20CI%20Tests?branchName=master)](https://dev.azure.com/stmoy/Xaml%20Controls%20Gallery/_build/latest?definitionId=2&branchName=master)
 
-This sample shows how to:
+Shows all of the XAML controls in an interactive format. This app is the interactive companion to the [Fluent Design Guidelines](https://docs.microsoft.com/windows/uwp/design/basics/) and shows the usage of both UWP Xaml APIs and [Windows UI Library](https://docs.microsoft.com/windows/apps/winui/) APIs.
+
+
+## The XAML Controls Gallery shows how to:
 
 - **Specify XAML controls in markup:** Each control page shows the markup used to create each example.
-- **Use the Microsoft.UI.Xaml (WinUI) Library:** The app includes the latest WinUI NuGet package and shows how to use the [Windows UI Toolkit](https://docs.microsoft.com/en-us/uwp/toolkits/winui/) controls like NavigationView, SwipeControl, and more.
+- **Use the Microsoft.UI.Xaml (WinUI) Library:** The app includes the latest WinUI NuGet package and shows how to use the [Windows UI Library](https://docs.microsoft.com/windows/apps/winui/) controls like NavigationView, SwipeControl, and more.
+
 - **Basic layout:** This sample will show all of the possible layout options for your app and allow you to interact with the panels to show how to achieve any layout you are looking for.
 - **Adaptive UI:** In addition to showing how each control responds to different form factors, the app itself is responsive and shows various methods for achieving adaptive UI.
 - **Version adaptive code:** This sample shows how to write version adaptive code so that the app can run on previous versions of Windows while also using the latest capabilities on the most recent verison of Windows.
 
-**Note** The Xaml Controls Gallery requires [Visual Studio 2017](http://go.microsoft.com/fwlink/?LinkID=532422) to build and Windows 10 to execute.
-To obtain information about Windows 10 development, go to the [Windows Dev Center](http://go.microsoft.com/fwlink/?LinkID=532421)
+## Further information
+
+>**Note**: The Xaml Controls Gallery requires Visual Studio [2017](http://go.microsoft.com/fwlink/?LinkID=532422) or [2019](https://visualstudio.microsoft.com/vs/) to build and Windows 10 to execute.
+
+To obtain information about Windows 10 development, go to the [Windows Dev Center](https://developer.microsoft.com/windows)
 
 To obtain information about Microsoft Visual Studio and the tools for developing Windows apps, go to [Visual Studio](http://go.microsoft.com/fwlink/?LinkID=532422)
 
-To contact the authors, please reach out to ControlsGallery@microsoft.com
+## 🐞 Found a bug? Want a new sample?
 
-## Related topics
+If you find a bug **within the Xaml Controls Gallery** or want to request a new sample, please [file an issue](https://github.com/microsoft/Xaml-Controls-Gallery/issues/new/choose).
+
+If you find a bug **within your app (not in the Xaml Controls Gallery)** and need help, please [file an issue on the WinUI repo](https://github.com/microsoft/microsoft-ui-xaml/issues/new/choose).
 
-[XAML app UI, start to finish](http://msdn.microsoft.com/library/windows/apps/dn263191.aspx)  
 
-Each control page in the application has links to the relevant MSDN documentation for that control.
+## Related topics
+
+[Get started with Windows 10 apps](https://docs.microsoft.com/windows/uwp/get-started/)  
 
-[Install a prebuilt version of this sample](https://www.microsoft.com/store/productId/9MSVH128X2ZT).
+[Install a prebuilt version of this app from Microsoft Store](https://www.microsoft.com/store/productId/9MSVH128X2ZT). Each control page in the application has links to relevant Microsoft Docs for that control.
 
-[Windows UI Library (WinUI)](https://docs.microsoft.com/en-us/uwp/toolkits/winui/)
+[Windows UI Library (WinUI)](https://docs.microsoft.com/uwp/toolkits/winui/)
 
 ## Related samples
 
 [RSS reader sample](https://github.com/Microsoft/Windows-appsample-rssreader)  
 [Lunch Scheduler app sample](https://github.com/Microsoft/Windows-appsample-lunch-scheduler)  
 [Customers Orders Database sample](https://github.com/Microsoft/Windows-appsample-customers-orders-database)  
-[Universal Windows Platform (UWP) Samples](https://github.com/Microsoft/Windows-universal-samples/tree/dev)
+[Universal Windows Platform (UWP) Samples](https://github.com/Microsoft/Windows-universal-samples/tree/dev)

SharedContent/cs/Default.rd.xml

@@ -12,7 +12,7 @@
     <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
 
     Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
+    <Namespace Name="DataClasses.ViewModels" Serialize="All" />
 -->
 
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">

UITests/Button.cs

@@ -0,0 +1,95 @@
+//******************************************************************************
+//
+// Copyright (c) 2016 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//******************************************************************************
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OpenQA.Selenium.Appium.Windows;
+using System.Threading;
+
+namespace UITests
+{
+    [TestClass]
+    public class Button : Test_Base
+    {
+        private static WindowsElement buttonElement = null;
+
+        [ClassInitialize]
+        public static void ClassInitialize(TestContext context)
+        {
+            Setup(context);
+            var buttonTab = session.FindElementByName("Basic Input");
+            buttonTab.Click();
+            var button = session.FindElementByName("Button");
+            button.Click();
+            buttonElement = session.FindElementByAccessibilityId("Button1");
+            Assert.IsNotNull(buttonElement);
+            Thread.Sleep(3000);
+        }
+
+        [ClassCleanup]
+        public static void ClassCleanup()
+        {
+            TearDown();
+        }
+
+        [TestMethod]
+        public void Button_Click()
+        {
+
+            var buttonEventOutput = session.FindElementByAccessibilityId("Control1Output");
+            Assert.AreEqual(string.Empty, buttonEventOutput.Text);
+
+            buttonElement.Click();
+
+            Assert.AreEqual("You clicked: Button1", buttonEventOutput.Text);
+        }
+
+        [TestMethod]
+        public void Displayed()
+        {
+            Assert.IsTrue(buttonElement.Displayed);
+        }
+
+        [TestMethod]
+        public void Enabled()
+        {
+            var disableButtonCheckbox = session.FindElementByAccessibilityId("DisableButton1");
+            Assert.IsTrue(buttonElement.Enabled);
+            disableButtonCheckbox.Click();
+            Assert.IsFalse(buttonElement.Enabled);
+            disableButtonCheckbox.Click();
+            Assert.IsTrue(buttonElement.Enabled);
+        }
+
+        [TestMethod]
+        public void Name()
+        {
+            Assert.AreEqual("ControlType.Button", buttonElement.TagName);
+        }
+
+        [TestMethod]
+        public void Size()
+        {
+            Assert.IsTrue(buttonElement.Size.Width > 0);
+            Assert.IsTrue(buttonElement.Size.Height > 0);
+        }
+
+        [TestMethod]
+        public void Text()
+        {
+            Assert.AreEqual("Button", buttonElement.Text);
+        }
+    }
+}

UITests/CheckBox.cs

@@ -0,0 +1,126 @@
+//******************************************************************************
+//
+// Copyright (c) 2016 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//******************************************************************************
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OpenQA.Selenium.Appium.Windows;
+using System.Threading;
+
+namespace UITests
+{
+    [TestClass]
+    public class CheckBox : Test_Base
+    {
+        private static WindowsElement checkBoxElement1 = null;
+        private static WindowsElement checkBoxElement2 = null;
+
+        [ClassInitialize]
+        public static void ClassInitialize(TestContext context)
+        {
+            Setup(context);
+            var buttonTab = session.FindElementByName("Basic Input");
+            buttonTab.Click();
+            var button = session.FindElementByName("CheckBox");
+            button.Click();
+            Thread.Sleep(1000);
+            checkBoxElement1 = session.FindElementByName("Two-state CheckBox");
+            checkBoxElement2 = session.FindElementByName("Three-state CheckBox");
+            Assert.IsNotNull(checkBoxElement2);
+        }
+
+        [ClassCleanup]
+        public static void ClassCleanup()
+        {
+            TearDown();
+        }
+
+        [TestMethod]
+        public void Click()
+        {
+            var checkBoxEventOutput = session.FindElementByAccessibilityId("Control2Output");
+            Assert.AreEqual(string.Empty, checkBoxEventOutput.Text);
+
+            checkBoxElement2.Click();
+            Assert.AreEqual("CheckBox is checked.", checkBoxEventOutput.Text);
+
+            checkBoxElement2.Click();
+            Assert.AreEqual("CheckBox state is indeterminate.", checkBoxEventOutput.Text);
+
+            checkBoxElement2.Click();
+            Assert.AreEqual("CheckBox is unchecked.", checkBoxEventOutput.Text);
+        }
+
+        [TestMethod]
+        public void Displayed()
+        {
+            Assert.IsTrue(checkBoxElement1.Displayed);
+            Assert.IsTrue(checkBoxElement2.Displayed);
+        }
+
+        [TestMethod]
+        public void Enabled()
+        {
+            Assert.IsTrue(checkBoxElement1.Enabled);
+            Assert.IsTrue(checkBoxElement2.Enabled);
+        }
+
+        [TestMethod]
+        public void Location()
+        {
+            Assert.IsTrue(checkBoxElement2.Location.X >= checkBoxElement1.Location.X);
+            Assert.IsTrue(checkBoxElement2.Location.Y >= checkBoxElement1.Location.Y);
+        }
+
+        [TestMethod]
+        public void LocationInView()
+        {
+            Assert.IsTrue(checkBoxElement2.LocationOnScreenOnceScrolledIntoView.X >= checkBoxElement1.LocationOnScreenOnceScrolledIntoView.X);
+            Assert.IsTrue(checkBoxElement2.LocationOnScreenOnceScrolledIntoView.Y >= checkBoxElement1.LocationOnScreenOnceScrolledIntoView.Y);
+        }
+
+        [TestMethod]
+        public void Name()
+        {
+            Assert.AreEqual("ControlType.CheckBox", checkBoxElement1.TagName);
+            Assert.AreEqual("ControlType.CheckBox", checkBoxElement2.TagName);
+        }
+
+        [TestMethod]
+        public void Selected()
+        {
+            var originalState = checkBoxElement1.Selected;
+            checkBoxElement1.Click();
+            Assert.AreNotEqual(originalState, checkBoxElement1.Selected);
+            checkBoxElement1.Click();
+            Assert.AreEqual(originalState, checkBoxElement1.Selected);
+        }
+
+        [TestMethod]
+        public void Size()
+        {
+            Assert.IsTrue(checkBoxElement1.Size.Width > 0);
+            Assert.IsTrue(checkBoxElement1.Size.Height > 0);
+            Assert.IsTrue(checkBoxElement1.Size.Width <= checkBoxElement2.Size.Width);
+            Assert.AreEqual(checkBoxElement1.Size.Height, checkBoxElement2.Size.Height);
+        }
+
+        [TestMethod]
+        public void Text()
+        {
+            Assert.AreEqual("Two-state CheckBox", checkBoxElement1.Text);
+            Assert.AreEqual("Three-state CheckBox", checkBoxElement2.Text);
+        }
+    }
+}