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 @@ 4454b583-39a0-4a91-881c-2078fa26c447 $(MuxSdkVersion) - $(MuxSdkVersion) + 10.0.18362.0 en-US true WpfApp.csproj