From fdb393e97fc6fd7e43a6eddeeeb0ea627fd4c788 Mon Sep 17 00:00:00 2001
From: Keith Mahoney <41657372+kmahone@users.noreply.github.com>
Date: Wed, 28 Apr 2021 16:02:00 -0700
Subject: [PATCH] Fixes to enable CI and Release Pipelines to work reliably
 (#4919)

A few fixes:
Disabling unreliable test: [Test MUXControls\.ReleaseTest\.RepeaterNoCrashTest is unreliable \#4899](https://github.com/microsoft/microsoft-ui-xaml/issues/4899)

XamlIslandsTestApp was failing to install on test machines due to TargetPlatformMinVersion being tied to the version of SDK.

WinUI-CI was using a 'taefQuery' parameter to skip some tests (NugetPkgTestsOnly='True') when run as a framework package test app. However, this was not being plumbed through for the Release Pipeline, which resulted in test failures. The yml is refactored a bit to avoid this problem.
---
 build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml     | 3 ++-
 build/MUX-CI.yml                                               | 1 -
 .../MUXControls.ReleaseTest/NugetTestsCX.cs                    | 1 +
 .../XamlIslandsTestApp/WpfApp/WpfApp.Package.wapproj           | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml b/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml
index 0c9005402e..082bb3473f 100644
--- a/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml
+++ b/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml
@@ -98,7 +98,8 @@ jobs:
       testSuite: 'NugetTestSuite'
       helixType: ${{ parameters.helixType }}
       artifactName: ${{ parameters.buildArtifactName }}
-      taefQuery: ${{ parameters.taefQuery }}
+      ${{if eq(parameters.useFrameworkPkg, 'true')}}:
+        taefQuery: "(not (@NugetPkgTestsOnly = 'true'))"
       rerunPassesRequiredToAvoidFailure: 5
       ${{if ne(parameters.test_matrix, '') }}:
         matrix: ${{ parameters.test_matrix }}
\ No newline at end of file
diff --git a/build/MUX-CI.yml b/build/MUX-CI.yml
index e67f7d0733..5694073b25 100644
--- a/build/MUX-CI.yml
+++ b/build/MUX-CI.yml
@@ -70,7 +70,6 @@ jobs:
     helixType: 'test/frpkg'
     dependsOn: CreateNugetPackage
     useFrameworkPkg: true
-    taefQuery: "(not (@NugetPkgTestsOnly = 'true'))"
 
 - template: AzurePipelinesTemplates\MUX-ProcessTestResults-Job.yml
   parameters:
diff --git a/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/NugetTestsCX.cs b/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/NugetTestsCX.cs
index f7602404d2..50cd108785 100644
--- a/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/NugetTestsCX.cs
+++ b/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/NugetTestsCX.cs
@@ -50,6 +50,7 @@ public void BasicTestCX()
         }
 
         [TestMethod]
+        [TestProperty("Ignore", "True")] // Issue #4899: Test MUXControls.ReleaseTest.RepeaterNoCrashTest is unreliable 
         public void RepeaterNoCrashTest()
         {
             var button = new Button(FindElement.ByName("AddItemsButton"));
diff --git a/test/MUXControlsReleaseTest/XamlIslandsTestApp/WpfApp/WpfApp.Package.wapproj b/test/MUXControlsReleaseTest/XamlIslandsTestApp/WpfApp/WpfApp.Package.wapproj
index 164536792c..b2df2b80e0 100644
--- a/test/MUXControlsReleaseTest/XamlIslandsTestApp/WpfApp/WpfApp.Package.wapproj
+++ b/test/MUXControlsReleaseTest/XamlIslandsTestApp/WpfApp/WpfApp.Package.wapproj
@@ -31,7 +31,7 @@
   <PropertyGroup>
     <ProjectGuid>4454b583-39a0-4a91-881c-2078fa26c447</ProjectGuid>
     <TargetPlatformVersion>$(MuxSdkVersion)</TargetPlatformVersion>
-    <TargetPlatformMinVersion>$(MuxSdkVersion)</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>true</AppxPackageSigningEnabled>
     <EntryPointProjectUniqueName>WpfApp.csproj</EntryPointProjectUniqueName>