From f993afefd80d9cec0e54beb5273a5ebce367ba33 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Sat, 15 Jun 2019 10:39:26 -0700
Subject: [PATCH 1/3] Change _TestHelixAgentPool from 19H1 to RS5

---
 eng/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 2df4c786d9e..acd886ab456 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -50,7 +50,7 @@ jobs:
         - name: _PlatformArgs
           value: /p:Platform=$(_Platform)
         - name: _TestHelixAgentPool
-          value: 'Windows.10.Amd64.Open%3bWindows.7.Amd64.Open%3bWindows.10.Amd64.Client19H1.Open'
+          value: 'Windows.10.Amd64.Open%3bWindows.7.Amd64.Open%3bWindows.10.Amd64.ClientRS5.Open'
         - name: _HelixStagingDir
           value: $(BUILD.STAGINGDIRECTORY)\helix\functests
         - name: _HelixSource
@@ -97,7 +97,7 @@ jobs:
           - name: _HelixCreator
             value: '' #if _HelixToken is set, Creator must be empty
           - name: _TestHelixAgentPool
-            value: 'Windows.10.Amd64%3bWindows.7.Amd64%3bWindows.10.Amd64.Client19H1'
+            value: 'Windows.10.Amd64%3bWindows.7.Amd64%3bWindows.10.Amd64.ClientRS5'
       strategy:
         matrix:
           Build_Debug_x86:

From 5a9ab9c5be9d24965010c159db873b2cd3d0e17e Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Mon, 17 Jun 2019 10:08:27 -0700
Subject: [PATCH 2/3] - Further restric the Agent Pools to
 Windows.10.Amd64.CleintRS5 - this is the only one that seems immune to
 timeouts - Limit Helix test runs to the open build pipline. Do not repeat the
 same tests in the internal pipeline.

---
 eng/pipeline.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index acd886ab456..d8bd55db486 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -50,7 +50,7 @@ jobs:
         - name: _PlatformArgs
           value: /p:Platform=$(_Platform)
         - name: _TestHelixAgentPool
-          value: 'Windows.10.Amd64.Open%3bWindows.7.Amd64.Open%3bWindows.10.Amd64.ClientRS5.Open'
+          value: 'Windows.10.Amd64.ClientRS5.Open' # Preferred:'Windows.10.Amd64.Open%3bWindows.7.Amd64.Open%3bWindows.10.Amd64.ClientRS5.Open'
         - name: _HelixStagingDir
           value: $(BUILD.STAGINGDIRECTORY)\helix\functests
         - name: _HelixSource
@@ -59,6 +59,8 @@ jobs:
           value: ''
         - name: _HelixCreator
           value: ${{ parameters.repoName }}
+        - name: _HelixPublicBuildPipeline  # Run Helix tests when building in the open, do not repeat when building and publishign again using the internal build-pipeline
+          value: true
 
         # Override some values if we're building internally
         - ${{ if eq(parameters.runAsPublic, 'false') }}:
@@ -97,7 +99,9 @@ jobs:
           - name: _HelixCreator
             value: '' #if _HelixToken is set, Creator must be empty
           - name: _TestHelixAgentPool
-            value: 'Windows.10.Amd64%3bWindows.7.Amd64%3bWindows.10.Amd64.ClientRS5'
+            value: 'Windows.10.Amd64.ClientRS5' # Preferred: 'Windows.10.Amd64%3bWindows.7.Amd64%3bWindows.10.Amd64.ClientRS5'
+          - name: _HelixPublicBuildPipeline
+            value: false
       strategy:
         matrix:
           Build_Debug_x86:
@@ -152,4 +156,4 @@ jobs:
           HelixAccessToken: $(_HelixToken)              # only defined for internal CI
           Creator: $(_HelixCreator)
           SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-        condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release')) # on helix machine (with real signing)
+        condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release'), eq(variables['_HelixPublicBuildPipeline'], 'true')) # on helix machine (with real signing) when running on the public build pipeline

From d035cf57a64fcb16a004ff25078a91dbcd70e97a Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Mon, 17 Jun 2019 10:53:43 -0700
Subject: [PATCH 3/3] Setting build timeout to 120 mins

---
 azure-pipelines.yml | 2 ++
 eng/pipeline.yml    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cdd327e1763..3b4c5e2864e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -36,3 +36,5 @@ jobs:
         queue: buildpool.windows.10.amd64.vs2019.pre
       # runAsPublic is used in expressions, which can't read from user-defined variables
       runAsPublic: false
+    timeoutInMinutes: 120 # how long to run the job before automatically cancelling; see https://github.com/dotnet/wpf/issues/952
+
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index d8bd55db486..aba897142dc 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -50,7 +50,7 @@ jobs:
         - name: _PlatformArgs
           value: /p:Platform=$(_Platform)
         - name: _TestHelixAgentPool
-          value: 'Windows.10.Amd64.ClientRS5.Open' # Preferred:'Windows.10.Amd64.Open%3bWindows.7.Amd64.Open%3bWindows.10.Amd64.ClientRS5.Open'
+          value: 'Windows.10.Amd64.ClientRS5.Open' # Preferred:'Windows.10.Amd64.Open%3bWindows.7.Amd64.Open%3bWindows.10.Amd64.ClientRS5.Open'; See https://github.com/dotnet/wpf/issues/952
         - name: _HelixStagingDir
           value: $(BUILD.STAGINGDIRECTORY)\helix\functests
         - name: _HelixSource