diff --git a/src/SamplesApp/UITests.Shared/Windows_ApplicationModel/PackageTests.xaml b/src/SamplesApp/UITests.Shared/Windows_ApplicationModel/PackageTests.xaml
index d63a9225942f..875b150dc775 100644
--- a/src/SamplesApp/UITests.Shared/Windows_ApplicationModel/PackageTests.xaml
+++ b/src/SamplesApp/UITests.Shared/Windows_ApplicationModel/PackageTests.xaml
@@ -4,8 +4,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:UITests.Shared.Windows_ApplicationModel"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- mc:Ignorable="d"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:generic="using:System.Collections.Generic"
+ mc:Ignorable="d"
d:DesignHeight="300"
d:DesignWidth="400">
@@ -13,26 +13,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/SamplesApp/UITests.Shared/Windows_ApplicationModel/PackageTests.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_ApplicationModel/PackageTests.xaml.cs
index f247fe76bd69..81397a9236e6 100644
--- a/src/SamplesApp/UITests.Shared/Windows_ApplicationModel/PackageTests.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Windows_ApplicationModel/PackageTests.xaml.cs
@@ -1,4 +1,6 @@
using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
using Uno.UI.Samples.Controls;
using Windows.ApplicationModel;
using Windows.System;
@@ -13,31 +15,68 @@ public sealed partial class PackageTests : UserControl
public PackageTests()
{
this.InitializeComponent();
- DisplayName = SafeSet(() => Package.Current.DisplayName);
- var packageId = Package.Current.Id;
- Architecture = SafeSet(() => packageId.Architecture);
- FamilyName = SafeSet(() => packageId.FamilyName);
- FullName = SafeSet(() => packageId.FullName);
- Name = SafeSet(() => packageId.Name);
- Publisher = SafeSet(() => packageId.Publisher);
- PublisherId = SafeSet(() => packageId.PublisherId);
- ResourceId = SafeSet(() => packageId.ResourceId);
- Version = SafeSet(() => $"{packageId.Version.Major}.{packageId.Version.Minor}.{packageId.Version.Revision}.{packageId.Version.Build}");
+
+ AddProperties(Package.Current);
}
- private string SafeSet(Func