From 6621137f1138e0440d60b947221d710ef3f54911 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 8 Sep 2022 11:28:45 -0500
Subject: [PATCH 1/3] Updated expired UI Test certificate. Expires 9/8/2023.

---
 UITests/UITests.App/Package.appxmanifest |   4 ++--
 UITests/UITests.App/UITests.App.csproj   |   5 +++--
 UITests/UITests.App/UITests.App.pfx      | Bin 2528 -> 2520 bytes
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/UITests/UITests.App/Package.appxmanifest b/UITests/UITests.App/Package.appxmanifest
index bb5c6d4e96e..9aa617ea938 100644
--- a/UITests/UITests.App/Package.appxmanifest
+++ b/UITests/UITests.App/Package.appxmanifest
@@ -1,4 +1,4 @@
-<Package
+<Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
   xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
@@ -7,7 +7,7 @@
 
   <Identity
     Name="3568ebdf-5b6b-4ddd-bb17-462d614ba50f"
-    Publisher="CN=alzollin"
+    Publisher="CN=toolkit"
     Version="1.0.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="3568ebdf-5b6b-4ddd-bb17-462d614ba50f" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 70ce6743c4f..700d057527b 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -21,8 +21,8 @@
     <AppxBundle>Never</AppxBundle>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <PackageCertificateKeyFile>UITests.App.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>A39FFC9A7EDC3BC1F62B1FC6409AD9EDD84E8CF0</PackageCertificateThumbprint>
+    <PackageCertificateKeyFile>UITests.App_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>C732A02FD6C4120C84E0559E5ADE1A83D15B41BD</PackageCertificateThumbprint>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
@@ -186,6 +186,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="UITests.App.pfx" />
+    <None Include="UITests.App_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.Connectivity\Microsoft.Toolkit.Uwp.Connectivity.csproj">
diff --git a/UITests/UITests.App/UITests.App.pfx b/UITests/UITests.App/UITests.App.pfx
index 946bbe25ddc57fab6ec1cc8c5902770be6f13b34..635d72d46647a4efe24f8eaf604c6d28fe5d105e 100644
GIT binary patch
delta 2335
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
F2hjg(UUUEe

delta 2343
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
N^~&)V;c)^22hiC{Ua9~9


From 8e45057840c4649425730ac6a5db717b0d4a7723 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 8 Sep 2022 11:36:56 -0500
Subject: [PATCH 2/3] Updated testAppName and testAppPackageFamilyName for
 AppService communication

---
 UITests/UITests.Tests.Shared/TestAssembly.cs | 2 +-
 UITests/UITests.Tests.Shared/UITestBase.cs   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/UITests/UITests.Tests.Shared/TestAssembly.cs b/UITests/UITests.Tests.Shared/TestAssembly.cs
index 47d45afbcdd..e2956adde8e 100644
--- a/UITests/UITests.Tests.Shared/TestAssembly.cs
+++ b/UITests/UITests.Tests.Shared/TestAssembly.cs
@@ -52,7 +52,7 @@ private static async Task InitalizeComService()
 
             // Use Windows.ApplicationModel.Package.Current.Id.FamilyName
             // within the app service provider to get this value.
-            CommunicationService.PackageFamilyName = "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t";
+            CommunicationService.PackageFamilyName = "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_yeyc6z1eztrme";
 
             var status = await CommunicationService.OpenAsync();
 
diff --git a/UITests/UITests.Tests.Shared/UITestBase.cs b/UITests/UITests.Tests.Shared/UITestBase.cs
index d2a43582449..d513a7ca2e6 100644
--- a/UITests/UITests.Tests.Shared/UITestBase.cs
+++ b/UITests/UITests.Tests.Shared/UITestBase.cs
@@ -58,8 +58,8 @@ internal static TestApplicationInfo WinUICsUWPSampleApp
 
                 return new TestApplicationInfo(
                     testAppPackageName: "UITests.App",
-                    testAppName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t!App",
-                    testAppPackageFamilyName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t",
+                    testAppName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_yeyc6z1eztrme!App",
+                    testAppPackageFamilyName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_yeyc6z1eztrme",
                     testAppMainWindowTitle: "UITests.App",
                     processName: "UITests.App.exe",
                     installerName: mostRecentlyBuiltPackage.Replace(".msix", string.Empty),

From 2953f3bebbf7c689178888049398132c71b3552e Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 8 Sep 2022 11:39:22 -0500
Subject: [PATCH 3/3] Fixed generated csproj issues

---
 UITests/UITests.App/UITests.App.csproj | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 700d057527b..a82743b5f4f 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -21,7 +21,7 @@
     <AppxBundle>Never</AppxBundle>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <PackageCertificateKeyFile>UITests.App_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>UITests.App.pfx</PackageCertificateKeyFile>
     <PackageCertificateThumbprint>C732A02FD6C4120C84E0559E5ADE1A83D15B41BD</PackageCertificateThumbprint>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
@@ -186,7 +186,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="UITests.App.pfx" />
-    <None Include="UITests.App_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.Connectivity\Microsoft.Toolkit.Uwp.Connectivity.csproj">