Merge pull request microsoft#1335 from chingucoding/dev/fix-build-errors

Fix build errors and CI
marcelwgn · Aug 28, 2023 · 5ab6b6f · 5ab6b6f
2 parents 91818c9 + d7c780b
commit 5ab6b6f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/UITests/AxeHelper.cs b/UITests/AxeHelper.cs
@@ -28,7 +28,7 @@ public class AxeHelper
 
 		internal static void InitializeAxe()
 		{
-			var processes = Process.GetProcessesByName("WinUIGallery.DesktopWap");
+			var processes = Process.GetProcessesByName("WinUIGallery");
 			Assert.IsTrue(processes.Length > 0);
 
 			var config = Config.Builder.ForProcessId(processes[0].Id).Build();

diff --git a/UITests/TestBase.cs b/UITests/TestBase.cs
@@ -54,8 +54,8 @@ private static WindowsElement WaitForPageHeader(string name)
 		{
 			for (int i = 0; i < 100; i++)
 			{
-				var header = Session.FindElementsByName(name).Where(x => x.GetProperty("AutomationId") == "PageHeader").First();
-				if (header != null)
+				var header = Session.FindElementByAccessibilityId("PageHeader");
+				if (header != null && header.Text == name)
 				{
 					return header;
 				}

diff --git a/WinUIGallery/Controls/PageHeader.xaml b/WinUIGallery/Controls/PageHeader.xaml
@@ -27,7 +27,6 @@
         </Grid.RowDefinitions>
 
         <TextBlock
-            AutomationProperties.HeadingLevel="Level1"
             Style="{StaticResource TitleTextBlockStyle}"
             Text="{x:Bind Item.Title}"
             AutomationProperties.AutomationId="PageHeader"

diff --git a/WinUIGallery/WinUIGallery.csproj b/WinUIGallery/WinUIGallery.csproj
@@ -49,8 +49,14 @@
           <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
           <SDKVersion>10.0</SDKVersion>
           <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+          <PfxFile>$(MSBuildProjectDirectory)\..\build\WinUI-Gallery-Test.pfx</PfxFile>
       </PropertyGroup>
 
+      <PropertyGroup Condition="Exists('$(PfxFile)')">
+          <PackageCertificateKeyFile>..\build\WinUI-Gallery-Test.pfx</PackageCertificateKeyFile>
+      </PropertyGroup>
+
+
       <ItemGroup>
           <AppxManifest Include="Package.appxmanifest"
                         Condition="'$(Configuration)' == 'Release' Or '$(Configuration)' == 'Release-Unpackaged'">

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -36,13 +36,14 @@ steps:
         targetType: filePath
         filePath: build/GenerateTestPFX.ps1
 
-
-    - task: VSBuild@1
+    - task: DotNetCoreCLI@2
       inputs:
-          platform: $(buildPlatform)
-          solution: "$(solutionGallery)"
-          configuration: "$(buildConfiguration)"
-          msbuildArgs: '/p:PublishReadyToRun=false /p:AppxBundlePlatforms="$(buildPlatform)" /p:AppxPackageDir="$(appxPackageDir)" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=SideloadOnly /p:AppxPackageSigningEnabled=true'
+        command: 'publish'
+        publishWebProjects: false
+        projects: '$(solutionGallery)'
+        arguments: '/p:AppxPackageDir="D:\a\1\a\AppxPackages\\" /p:platform="$(buildPlatform)" /p:PublishProfile="./WinUIGallery/Properties/PublishProfiles/win10-$(buildPlatform).pubxml"'
+        zipAfterPublish: false
+        modifyOutputPath: false
 
     - task: PowerShell@2
       inputs: