From a5441abf9299d4a420f7fea8655380c55e624912 Mon Sep 17 00:00:00 2001
From: peterstone2017 <12449837+YunchuWang@users.noreply.github.com>
Date: Fri, 16 May 2025 16:22:25 -0700
Subject: [PATCH 01/11] Update test.yml to include 'dontDistribute' flag in CI
 configuration

---
 eng/templates/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/templates/test.yml b/eng/templates/test.yml
index 59de51f90..5f179d14f 100644
--- a/eng/templates/test.yml
+++ b/eng/templates/test.yml
@@ -24,6 +24,7 @@ steps:
       testFiltercriteria: 'TestCategory!=DisabledInCI'
       vsTestVersion: 17.0
       distributionBatchType: basedOnExecutionTime
+      dontDistribute: true
       platform: 'any cpu'
       configuration: 'Debug'
       diagnosticsEnabled: True

From 3a13f5a95da3da3df77a35b4443888f4e3639868 Mon Sep 17 00:00:00 2001
From: peterstone2017 <12449837+YunchuWang@users.noreply.github.com>
Date: Fri, 16 May 2025 16:35:30 -0700
Subject: [PATCH 02/11] test..

---
 eng/templates/test.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eng/templates/test.yml b/eng/templates/test.yml
index 5f179d14f..ffa5133bc 100644
--- a/eng/templates/test.yml
+++ b/eng/templates/test.yml
@@ -23,8 +23,7 @@ steps:
       testAssemblyVer2: ${{ parameters.testAssembly }}
       testFiltercriteria: 'TestCategory!=DisabledInCI'
       vsTestVersion: 17.0
-      distributionBatchType: basedOnExecutionTime
-      dontDistribute: true
+      distributionBatchType: basedOnTestCases
       platform: 'any cpu'
       configuration: 'Debug'
       diagnosticsEnabled: True

From aa27d124b86f93d0e30d1156c442c5a7bc734cab Mon Sep 17 00:00:00 2001
From: peterstone2017 <12449837+YunchuWang@users.noreply.github.com>
Date: Fri, 16 May 2025 17:02:59 -0700
Subject: [PATCH 03/11] remove distributionBatchType

---
 eng/templates/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eng/templates/test.yml b/eng/templates/test.yml
index ffa5133bc..3861d9d19 100644
--- a/eng/templates/test.yml
+++ b/eng/templates/test.yml
@@ -23,7 +23,6 @@ steps:
       testAssemblyVer2: ${{ parameters.testAssembly }}
       testFiltercriteria: 'TestCategory!=DisabledInCI'
       vsTestVersion: 17.0
-      distributionBatchType: basedOnTestCases
       platform: 'any cpu'
       configuration: 'Debug'
       diagnosticsEnabled: True

From ada313d566b568cd2e726b0ea40dd3d9567c2644 Mon Sep 17 00:00:00 2001
From: peterstone2017 <12449837+YunchuWang@users.noreply.github.com>
Date: Fri, 16 May 2025 18:16:06 -0700
Subject: [PATCH 04/11] publish artifact

---
 eng/templates/build-steps.yml |  8 ++++++++
 eng/templates/test.yml        | 20 ++++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/eng/templates/build-steps.yml b/eng/templates/build-steps.yml
index 6cd1468d7..ff55653e5 100644
--- a/eng/templates/build-steps.yml
+++ b/eng/templates/build-steps.yml
@@ -88,6 +88,14 @@ steps:
       configuration: ${{ parameters.buildConfiguration }}
       msbuildArgs: /p:FileVersionRevision=$(Build.BuildId) /p:ContinuousIntegrationBuild=true
 
+  # Publish test binaries as artifact
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Core Tests Artifact'
+    inputs:
+      pathToPublish: '$(Build.SourcesDirectory)/Test/DurableTask.Core.Tests/bin/${{ parameters.buildConfiguration }}'
+      artifactName: 'CoreTests'
+      publishLocation: 'Container'
+
   - task: VSBuild@1
     displayName: 'Build (AzureStorage Tests)'
     inputs:
diff --git a/eng/templates/test.yml b/eng/templates/test.yml
index 3861d9d19..14fbd02f1 100644
--- a/eng/templates/test.yml
+++ b/eng/templates/test.yml
@@ -5,6 +5,19 @@ parameters:
 
 
 steps:
+  - task: DownloadBuildArtifacts@0
+    displayName: 'Download Test Artifacts'
+    inputs:
+      buildType: 'current'
+      downloadType: 'single'
+      artifactName: 'CoreTests'
+      downloadPath: '$(System.DefaultWorkingDirectory)/tests'
+
+  - bash: |
+      echo "Listing downloaded test DLLs:"
+      find $(System.DefaultWorkingDirectory)/tests -name '*Test*.dll'
+      displayName: 'List Test DLLs'
+
   # Install Azurite
   - bash: |
       echo "Installing azurite"
@@ -20,13 +33,16 @@ steps:
   - task: VSTest@2
     displayName: 'Run tests'
     inputs:
-      testAssemblyVer2: ${{ parameters.testAssembly }}
+      testAssemblyVer2: |
+        $(System.DefaultWorkingDirectory)/tests/${{ parameters.testAssembly }}
       testFiltercriteria: 'TestCategory!=DisabledInCI'
       vsTestVersion: 17.0
+      distributionBatchType: basedOnExecutionTime
       platform: 'any cpu'
       configuration: 'Debug'
       diagnosticsEnabled: True
       collectDumpOn: always
       rerunFailedTests: true
       rerunFailedThreshold: 30
-      rerunMaxAttempts: 3
\ No newline at end of file
+      rerunMaxAttempts: 3
+      runInParallel: true
\ No newline at end of file

From 8be09fd6b218fe5fea94da9c8c3998ebcf34f7ed Mon Sep 17 00:00:00 2001
From: peterstone2017 <12449837+YunchuWang@users.noreply.github.com>
Date: Fri, 16 May 2025 18:37:09 -0700
Subject: [PATCH 05/11] fix

---
 eng/templates/build-steps.yml | 8 +++-----
 eng/templates/test.yml        | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/eng/templates/build-steps.yml b/eng/templates/build-steps.yml
index ff55653e5..0be73f0f4 100644
--- a/eng/templates/build-steps.yml
+++ b/eng/templates/build-steps.yml
@@ -88,13 +88,11 @@ steps:
       configuration: ${{ parameters.buildConfiguration }}
       msbuildArgs: /p:FileVersionRevision=$(Build.BuildId) /p:ContinuousIntegrationBuild=true
 
-  # Publish test binaries as artifact
-  - task: PublishBuildArtifacts@1
+  - task: 1ES.PublishPipelineArtifact@1
     displayName: 'Publish Core Tests Artifact'
     inputs:
-      pathToPublish: '$(Build.SourcesDirectory)/Test/DurableTask.Core.Tests/bin/${{ parameters.buildConfiguration }}'
-      artifactName: 'CoreTests'
-      publishLocation: 'Container'
+      path: $(Build.SourcesDirectory)/Test/DurableTask.Core.Tests/bin/${{ parameters.buildConfiguration }}
+      artifact: CoreTests
 
   - task: VSBuild@1
     displayName: 'Build (AzureStorage Tests)'
diff --git a/eng/templates/test.yml b/eng/templates/test.yml
index 14fbd02f1..770023284 100644
--- a/eng/templates/test.yml
+++ b/eng/templates/test.yml
@@ -5,13 +5,11 @@ parameters:
 
 
 steps:
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download Test Artifacts'
+  - task: 1ES.DownloadPipelineArtifact@1
+    displayName: 'Download Core Tests Artifact'
     inputs:
-      buildType: 'current'
-      downloadType: 'single'
       artifactName: 'CoreTests'
-      downloadPath: '$(System.DefaultWorkingDirectory)/tests'
+      targetPath: '$(System.DefaultWorkingDirectory)/tests'
 
   - bash: |
       echo "Listing downloaded test DLLs:"

From 4c7e6824732ab514fa770152a02a7fbada41447d Mon Sep 17 00:00:00 2001
From: peterstone2017 <12449837+YunchuWang@users.noreply.github.com>
Date: Fri, 16 May 2025 18:40:11 -0700
Subject: [PATCH 06/11] downloadjob

---
 eng/templates/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/templates/test.yml b/eng/templates/test.yml
index 770023284..aed14af0b 100644
--- a/eng/templates/test.yml
+++ b/eng/templates/test.yml
@@ -5,7 +5,7 @@ parameters:
 
 
 steps:
-  - task: 1ES.DownloadPipelineArtifact@1
+  - task: DownloadPipelineArtifact@2
     displayName: 'Download Core Tests Artifact'
     inputs:
       artifactName: 'CoreTests'

From 7174b1b1ff783ef0301bc52cb5687399595c46db Mon Sep 17 00:00:00 2001
From: peterstone2017 <12449837+YunchuWang@users.noreply.github.com>
Date: Fri, 16 May 2025 22:12:15 -0700
Subject: [PATCH 07/11] Fix quoting in test.yml for DLL listing command

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

diff --git a/eng/templates/test.yml b/eng/templates/test.yml
index aed14af0b..9e3ac682f 100644
--- a/eng/templates/test.yml
+++ b/eng/templates/test.yml
@@ -13,8 +13,8 @@ steps:
 
   - bash: |
       echo "Listing downloaded test DLLs:"
-      find $(System.DefaultWorkingDirectory)/tests -name '*Test*.dll'
-      displayName: 'List Test DLLs'
+      find "$(System.DefaultWorkingDirectory)/tests" -name '*Test*.dll'
+    displayName: 'List Test DLLs'
 
   # Install Azurite
   - bash: |

From e548835eea934bc38e3fc55ae622005efc66afdd Mon Sep 17 00:00:00 2001
From: peterstone2017 <12449837+YunchuWang@users.noreply.github.com>
Date: Fri, 16 May 2025 22:52:58 -0700
Subject: [PATCH 08/11] path fix

---
 eng/ci/public-build.yml | 2 +-
 eng/templates/test.yml  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml
index d28201633..e2557ed0a 100644
--- a/eng/ci/public-build.yml
+++ b/eng/ci/public-build.yml
@@ -70,7 +70,7 @@ extends:
         # Run tests
         - template: /eng/templates/test.yml@self
           parameters:
-            testAssembly: '**\bin\**\DurableTask.Core.Tests.dll'
+            testAssembly: 'tests/**/DurableTask.Core.Tests.dll'
     - stage: DTFxASValidate
       dependsOn: []
       jobs:
diff --git a/eng/templates/test.yml b/eng/templates/test.yml
index 9e3ac682f..4953f1e09 100644
--- a/eng/templates/test.yml
+++ b/eng/templates/test.yml
@@ -3,7 +3,6 @@ parameters:
   type: string
   default: ''
 
-
 steps:
   - task: DownloadPipelineArtifact@2
     displayName: 'Download Core Tests Artifact'
@@ -32,7 +31,7 @@ steps:
     displayName: 'Run tests'
     inputs:
       testAssemblyVer2: |
-        $(System.DefaultWorkingDirectory)/tests/${{ parameters.testAssembly }}
+        $(System.DefaultWorkingDirectory)/${{ parameters.testAssembly }}
       testFiltercriteria: 'TestCategory!=DisabledInCI'
       vsTestVersion: 17.0
       distributionBatchType: basedOnExecutionTime

From e46d67ffd5ae81771ffe05a50bafa182e28b7ae9 Mon Sep 17 00:00:00 2001
From: peterstone2017 <12449837+YunchuWang@users.noreply.github.com>
Date: Fri, 16 May 2025 23:22:55 -0700
Subject: [PATCH 09/11] artifact for all

---
 eng/ci/public-build.yml       |  7 +++++--
 eng/templates/build-steps.yml | 14 +++++++++++++-
 eng/templates/test.yml        |  7 +++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml
index e2557ed0a..0dec405b5 100644
--- a/eng/ci/public-build.yml
+++ b/eng/ci/public-build.yml
@@ -71,6 +71,7 @@ extends:
         - template: /eng/templates/test.yml@self
           parameters:
             testAssembly: 'tests/**/DurableTask.Core.Tests.dll'
+            artifactName: 'CoreTests'
     - stage: DTFxASValidate
       dependsOn: []
       jobs:
@@ -89,7 +90,8 @@ extends:
         # Run tests
         - template: /eng/templates/test.yml@self
           parameters:
-            testAssembly: '**\bin\**\DurableTask.AzureStorage.Tests.dll'
+            testAssembly: 'tests/**/DurableTask.AzureStorage.Tests.dll'
+            artifactName: 'AzureStorageTests'
     - stage: DTFxEmulatorValidate
       dependsOn: []
       jobs:
@@ -108,4 +110,5 @@ extends:
         # Run tests
         - template: /eng/templates/test.yml@self
           parameters:
-            testAssembly: '**\bin\**\DurableTask.Emulator.Tests.dll'
+            testAssembly: 'tests/**/DurableTask.Emulator.Tests.dll'
+            artifactName: 'EmulatorTests'
diff --git a/eng/templates/build-steps.yml b/eng/templates/build-steps.yml
index 0be73f0f4..746a1dba7 100644
--- a/eng/templates/build-steps.yml
+++ b/eng/templates/build-steps.yml
@@ -102,6 +102,12 @@ steps:
       logFileVerbosity: minimal
       configuration: ${{ parameters.buildConfiguration }}
       msbuildArgs: /p:FileVersionRevision=$(Build.BuildId) /p:ContinuousIntegrationBuild=true
+  
+  - task: 1ES.PublishPipelineArtifact@1
+    displayName: 'Publish AzureStorage Tests Artifact'
+    inputs:
+      path: $(Build.SourcesDirectory)/Test/DurableTask.AzureStorage.Tests/bin/${{ parameters.buildConfiguration }}
+      artifact: AzureStorageTests
 
   - task: VSBuild@1
     displayName: 'Build (Emulator Tests)'
@@ -110,4 +116,10 @@ steps:
       vsVersion: '17.0'
       logFileVerbosity: minimal
       configuration: ${{ parameters.buildConfiguration }}
-      msbuildArgs: /p:FileVersionRevision=$(Build.BuildId) /p:ContinuousIntegrationBuild=true
\ No newline at end of file
+      msbuildArgs: /p:FileVersionRevision=$(Build.BuildId) /p:ContinuousIntegrationBuild=true
+
+  - task: 1ES.PublishPipelineArtifact@1
+    displayName: 'Publish Emulator Tests Artifact'
+    inputs:
+      path: $(Build.SourcesDirectory)/Test/DurableTask.Emulator.Tests/bin/${{ parameters.buildConfiguration }}
+      artifact: EmulatorTests
\ No newline at end of file
diff --git a/eng/templates/test.yml b/eng/templates/test.yml
index 4953f1e09..eed9f610f 100644
--- a/eng/templates/test.yml
+++ b/eng/templates/test.yml
@@ -2,12 +2,15 @@ parameters:
 - name: testAssembly
   type: string
   default: ''
+- name: artifactName
+  type: string
+  default: ''
 
 steps:
   - task: DownloadPipelineArtifact@2
-    displayName: 'Download Core Tests Artifact'
+    displayName: 'Download Tests Artifact'
     inputs:
-      artifactName: 'CoreTests'
+      artifactName: '${{ parameters.artifactName }}'
       targetPath: '$(System.DefaultWorkingDirectory)/tests'
 
   - bash: |

From eb11793806ad673ad15ab06ffd7898c631996a2d Mon Sep 17 00:00:00 2001
From: peterstone2017 <12449837+YunchuWang@users.noreply.github.com>
Date: Fri, 16 May 2025 23:58:12 -0700
Subject: [PATCH 10/11] one test

---
 .../ScheduleTaskOptions2Tests.cs              | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 Test/DurableTask.Core.Tests/ScheduleTaskOptions2Tests.cs

diff --git a/Test/DurableTask.Core.Tests/ScheduleTaskOptions2Tests.cs b/Test/DurableTask.Core.Tests/ScheduleTaskOptions2Tests.cs
new file mode 100644
index 000000000..ace808ab2
--- /dev/null
+++ b/Test/DurableTask.Core.Tests/ScheduleTaskOptions2Tests.cs
@@ -0,0 +1,25 @@
+// ---------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// ---------------------------------------------------------------
+
+namespace DurableTask.Core.Tests
+{
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using System;
+    using System.Collections.Generic;
+
+    [TestClass]
+    public class ScheduleTaskOptions2Tests
+    {
+        [TestMethod]
+        public void CreateBuilder_ShouldReturnBuilderInstance2()
+        {
+            // Act
+            ScheduleTaskOptions.Builder builder = ScheduleTaskOptions.CreateBuilder();
+
+            // Assert
+            Assert.IsNotNull(builder);
+            Assert.IsInstanceOfType(builder, typeof(ScheduleTaskOptions.Builder));
+        }
+    }
+}
\ No newline at end of file

From 55a0cd2e8a7df91576a6a5ca5d513932084211fe Mon Sep 17 00:00:00 2001
From: peterstone2017 <12449837+YunchuWang@users.noreply.github.com>
Date: Sat, 17 May 2025 07:56:59 -0700
Subject: [PATCH 11/11] Revert "one test"

This reverts commit eb11793806ad673ad15ab06ffd7898c631996a2d.
---
 .../ScheduleTaskOptions2Tests.cs              | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 Test/DurableTask.Core.Tests/ScheduleTaskOptions2Tests.cs

diff --git a/Test/DurableTask.Core.Tests/ScheduleTaskOptions2Tests.cs b/Test/DurableTask.Core.Tests/ScheduleTaskOptions2Tests.cs
deleted file mode 100644
index ace808ab2..000000000
--- a/Test/DurableTask.Core.Tests/ScheduleTaskOptions2Tests.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// ---------------------------------------------------------------
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// ---------------------------------------------------------------
-
-namespace DurableTask.Core.Tests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System;
-    using System.Collections.Generic;
-
-    [TestClass]
-    public class ScheduleTaskOptions2Tests
-    {
-        [TestMethod]
-        public void CreateBuilder_ShouldReturnBuilderInstance2()
-        {
-            // Act
-            ScheduleTaskOptions.Builder builder = ScheduleTaskOptions.CreateBuilder();
-
-            // Assert
-            Assert.IsNotNull(builder);
-            Assert.IsInstanceOfType(builder, typeof(ScheduleTaskOptions.Builder));
-        }
-    }
-}
\ No newline at end of file