From f813094267a4c9d022cbb3f71e055cbe0c65bbe9 Mon Sep 17 00:00:00 2001
From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com>
Date: Mon, 9 Nov 2020 16:39:46 -0800
Subject: [PATCH 1/6] Try Windows build single quote fix

---
 build/ci/job-template.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml
index a7039757c4..9004d31060 100644
--- a/build/ci/job-template.yml
+++ b/build/ci/job-template.yml
@@ -112,10 +112,10 @@ jobs:
       - ${{ if eq(parameters.innerLoop, 'false') }}:
         - ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
           # TODO: Code coverage needs to be fixed.
-          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
+          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci #-coverage=${{ parameters.codeCoverage }}
             displayName: Run All Tests.
         - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
-          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments=-trait%20Category=RunSpecificTest #-coverage=${{ parameters.codeCoverage }}
+          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments='-trait%20Category=RunSpecificTest' #-coverage=${{ parameters.codeCoverage }}
             displayName: Run Specific Tests.
         - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
           - task: VSTest@2
@@ -139,7 +139,7 @@ jobs:
               collectDumpOn: onAbortOnly
               publishRunAttachments: true
       - ${{ if eq(parameters.innerLoop, 'true') }}:
-        - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
+        - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments='-notrait%20Category=SkipInCI' #-coverage=${{ parameters.codeCoverage }}
           displayName: Run CI Tests.
     - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
       displayName: Upload coverage to codecov.io

From 0261f7240ed6bd353f5e53c3f1207ea480b77f34 Mon Sep 17 00:00:00 2001
From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com>
Date: Mon, 9 Nov 2020 17:04:01 -0800
Subject: [PATCH 2/6] Remove %20

---
 build/ci/job-template.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml
index 9004d31060..7d5af7650c 100644
--- a/build/ci/job-template.yml
+++ b/build/ci/job-template.yml
@@ -115,7 +115,7 @@ jobs:
           - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci #-coverage=${{ parameters.codeCoverage }}
             displayName: Run All Tests.
         - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
-          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments='-trait%20Category=RunSpecificTest' #-coverage=${{ parameters.codeCoverage }}
+          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments='-trait Category=RunSpecificTest' #-coverage=${{ parameters.codeCoverage }}
             displayName: Run Specific Tests.
         - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
           - task: VSTest@2
@@ -139,7 +139,7 @@ jobs:
               collectDumpOn: onAbortOnly
               publishRunAttachments: true
       - ${{ if eq(parameters.innerLoop, 'true') }}:
-        - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments='-notrait%20Category=SkipInCI' #-coverage=${{ parameters.codeCoverage }}
+        - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments='-notrait Category=SkipInCI' #-coverage=${{ parameters.codeCoverage }}
           displayName: Run CI Tests.
     - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
       displayName: Upload coverage to codecov.io

From 4d375636450bed1becc6a747d5a87d53d11f32da Mon Sep 17 00:00:00 2001
From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com>
Date: Mon, 9 Nov 2020 18:45:58 -0800
Subject: [PATCH 3/6] Added variable space value

---
 build/ci/job-template.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml
index 7d5af7650c..a8da3567d8 100644
--- a/build/ci/job-template.yml
+++ b/build/ci/job-template.yml
@@ -11,6 +11,7 @@ parameters:
   runSpecific: false
   container: ''
   useVSTestTask: false
+  spaceValue : ' '
 
 jobs:
   - job: ${{ parameters.name }}
@@ -48,6 +49,8 @@ jobs:
     pool: ${{ parameters.pool }}
     ${{ if ne(parameters.container, '') }}:
       container: ${{ parameters.container }}
+    ${{ if eq(parameters.buildScript, './build.sh') }}:
+      parameters.spaceValue: '%20'
 
     steps:
     # Work around MacOS Homebrew image/environment bug: https://github.com/actions/virtual-environments/issues/1811
@@ -115,7 +118,7 @@ jobs:
           - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci #-coverage=${{ parameters.codeCoverage }}
             displayName: Run All Tests.
         - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
-          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments='-trait Category=RunSpecificTest' #-coverage=${{ parameters.codeCoverage }}
+          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments='-trait${{ parameters.spaceValue }}Category=RunSpecificTest' #-coverage=${{ parameters.codeCoverage }}
             displayName: Run Specific Tests.
         - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
           - task: VSTest@2
@@ -139,7 +142,7 @@ jobs:
               collectDumpOn: onAbortOnly
               publishRunAttachments: true
       - ${{ if eq(parameters.innerLoop, 'true') }}:
-        - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments='-notrait Category=SkipInCI' #-coverage=${{ parameters.codeCoverage }}
+        - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments='-notrait${{ parameters.spaceValue }}Category=SkipInCI' #-coverage=${{ parameters.codeCoverage }}
           displayName: Run CI Tests.
     - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
       displayName: Upload coverage to codecov.io

From 157e52b7b8c20d68cc562438214369af9b3f8b80 Mon Sep 17 00:00:00 2001
From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com>
Date: Mon, 9 Nov 2020 18:56:18 -0800
Subject: [PATCH 4/6] Using variables for spacing

---
 build/ci/job-template.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml
index a8da3567d8..bdd714d89e 100644
--- a/build/ci/job-template.yml
+++ b/build/ci/job-template.yml
@@ -11,7 +11,6 @@ parameters:
   runSpecific: false
   container: ''
   useVSTestTask: false
-  spaceValue : ' '
 
 jobs:
   - job: ${{ parameters.name }}
@@ -30,6 +29,9 @@ jobs:
       packageUpdaterProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NugetPackageVersionUpdater/Microsoft.ML.NugetPackageVersionUpdater.csproj
       versionFilePath: $(Build.SourcesDirectory)/test/Microsoft.ML.NugetPackageVersionUpdater/latest_versions.txt
       PROCDUMP_PATH: '$(Build.SourcesDirectory)/Tools/ProcDump/'
+      spaceValue : ' '
+      ${{ if eq(parameters.buildScript, './build.sh') }}:
+        spaceValue: '%20'
     strategy:
       matrix:
         ${{ if eq(parameters.customMatrixes, '') }}:
@@ -49,8 +51,6 @@ jobs:
     pool: ${{ parameters.pool }}
     ${{ if ne(parameters.container, '') }}:
       container: ${{ parameters.container }}
-    ${{ if eq(parameters.buildScript, './build.sh') }}:
-      parameters.spaceValue: '%20'
 
     steps:
     # Work around MacOS Homebrew image/environment bug: https://github.com/actions/virtual-environments/issues/1811
@@ -118,7 +118,7 @@ jobs:
           - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci #-coverage=${{ parameters.codeCoverage }}
             displayName: Run All Tests.
         - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
-          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments='-trait${{ parameters.spaceValue }}Category=RunSpecificTest' #-coverage=${{ parameters.codeCoverage }}
+          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments='-trait$(spaceValue)Category=RunSpecificTest' #-coverage=${{ parameters.codeCoverage }}
             displayName: Run Specific Tests.
         - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
           - task: VSTest@2
@@ -142,7 +142,7 @@ jobs:
               collectDumpOn: onAbortOnly
               publishRunAttachments: true
       - ${{ if eq(parameters.innerLoop, 'true') }}:
-        - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments='-notrait${{ parameters.spaceValue }}Category=SkipInCI' #-coverage=${{ parameters.codeCoverage }}
+        - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments='-notrait$(spaceValue)Category=SkipInCI' #-coverage=${{ parameters.codeCoverage }}
           displayName: Run CI Tests.
     - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
       displayName: Upload coverage to codecov.io

From 037f217aa8bf91c82952554f1fbdbf8a99818cfe Mon Sep 17 00:00:00 2001
From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com>
Date: Mon, 9 Nov 2020 19:02:07 -0800
Subject: [PATCH 5/6] Added space values as job parameters

---
 .vsts-dotnet-ci.yml       | 7 +++++++
 build/ci/job-template.yml | 8 +++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml
index d3315c00c5..c09e5a5426 100644
--- a/.vsts-dotnet-ci.yml
+++ b/.vsts-dotnet-ci.yml
@@ -30,6 +30,7 @@ jobs:
     innerLoop: true
     pool:
       name: Hosted Ubuntu 1604
+    spaceValue: '%20'
 
 - template: /build/ci/job-template.yml
   parameters:
@@ -39,6 +40,7 @@ jobs:
     innerLoop: true
     pool:
       name: Hosted Ubuntu 1604
+    spaceValue: '%20'
 
 - template: /build/ci/job-template.yml
   parameters:
@@ -47,6 +49,7 @@ jobs:
     innerLoop: true
     pool:
       name: Hosted macOS
+    spaceValue: '%20'
 
 - template: /build/ci/job-template.yml
   parameters:
@@ -67,6 +70,7 @@ jobs:
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.0"
     pool:
       name: Hosted VS2017
+    spaceValue: ' '
 
 - template: /build/ci/job-template.yml
   parameters:
@@ -76,6 +80,7 @@ jobs:
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v2.1"
     pool:
       name: Hosted VS2017
+    spaceValue: ' '
 
 - template: /build/ci/job-template.yml
   parameters:
@@ -96,6 +101,7 @@ jobs:
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v4.0"
     pool:
       name: Hosted VS2017
+    spaceValue: ' '
 
 - template: /build/ci/job-template.yml
   parameters:
@@ -106,3 +112,4 @@ jobs:
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v2.1"
     pool:
       name: Hosted VS2017
+    spaceValue: ' '
diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml
index bdd714d89e..01da042160 100644
--- a/build/ci/job-template.yml
+++ b/build/ci/job-template.yml
@@ -11,6 +11,7 @@ parameters:
   runSpecific: false
   container: ''
   useVSTestTask: false
+  spaceValue : ' '
 
 jobs:
   - job: ${{ parameters.name }}
@@ -29,9 +30,6 @@ jobs:
       packageUpdaterProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NugetPackageVersionUpdater/Microsoft.ML.NugetPackageVersionUpdater.csproj
       versionFilePath: $(Build.SourcesDirectory)/test/Microsoft.ML.NugetPackageVersionUpdater/latest_versions.txt
       PROCDUMP_PATH: '$(Build.SourcesDirectory)/Tools/ProcDump/'
-      spaceValue : ' '
-      ${{ if eq(parameters.buildScript, './build.sh') }}:
-        spaceValue: '%20'
     strategy:
       matrix:
         ${{ if eq(parameters.customMatrixes, '') }}:
@@ -118,7 +116,7 @@ jobs:
           - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci #-coverage=${{ parameters.codeCoverage }}
             displayName: Run All Tests.
         - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
-          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments='-trait$(spaceValue)Category=RunSpecificTest' #-coverage=${{ parameters.codeCoverage }}
+          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments='-trait${{ parameters.spaceValue }}Category=RunSpecificTest' #-coverage=${{ parameters.codeCoverage }}
             displayName: Run Specific Tests.
         - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
           - task: VSTest@2
@@ -142,7 +140,7 @@ jobs:
               collectDumpOn: onAbortOnly
               publishRunAttachments: true
       - ${{ if eq(parameters.innerLoop, 'true') }}:
-        - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments='-notrait$(spaceValue)Category=SkipInCI' #-coverage=${{ parameters.codeCoverage }}
+        - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments='-notrait${{ parameters.spaceValue }}Category=SkipInCI' #-coverage=${{ parameters.codeCoverage }}
           displayName: Run CI Tests.
     - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
       displayName: Upload coverage to codecov.io

From 15da9dd695ce94dd502762f1199179ef9b09d946 Mon Sep 17 00:00:00 2001
From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com>
Date: Mon, 9 Nov 2020 19:16:54 -0800
Subject: [PATCH 6/6] Try conditional variables again

---
 .vsts-dotnet-ci.yml       | 7 -------
 build/ci/job-template.yml | 9 ++++++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml
index c09e5a5426..d3315c00c5 100644
--- a/.vsts-dotnet-ci.yml
+++ b/.vsts-dotnet-ci.yml
@@ -30,7 +30,6 @@ jobs:
     innerLoop: true
     pool:
       name: Hosted Ubuntu 1604
-    spaceValue: '%20'
 
 - template: /build/ci/job-template.yml
   parameters:
@@ -40,7 +39,6 @@ jobs:
     innerLoop: true
     pool:
       name: Hosted Ubuntu 1604
-    spaceValue: '%20'
 
 - template: /build/ci/job-template.yml
   parameters:
@@ -49,7 +47,6 @@ jobs:
     innerLoop: true
     pool:
       name: Hosted macOS
-    spaceValue: '%20'
 
 - template: /build/ci/job-template.yml
   parameters:
@@ -70,7 +67,6 @@ jobs:
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.0"
     pool:
       name: Hosted VS2017
-    spaceValue: ' '
 
 - template: /build/ci/job-template.yml
   parameters:
@@ -80,7 +76,6 @@ jobs:
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v2.1"
     pool:
       name: Hosted VS2017
-    spaceValue: ' '
 
 - template: /build/ci/job-template.yml
   parameters:
@@ -101,7 +96,6 @@ jobs:
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v4.0"
     pool:
       name: Hosted VS2017
-    spaceValue: ' '
 
 - template: /build/ci/job-template.yml
   parameters:
@@ -112,4 +106,3 @@ jobs:
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v2.1"
     pool:
       name: Hosted VS2017
-    spaceValue: ' '
diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml
index 01da042160..ece5824fbd 100644
--- a/build/ci/job-template.yml
+++ b/build/ci/job-template.yml
@@ -11,7 +11,6 @@ parameters:
   runSpecific: false
   container: ''
   useVSTestTask: false
-  spaceValue : ' '
 
 jobs:
   - job: ${{ parameters.name }}
@@ -30,6 +29,10 @@ jobs:
       packageUpdaterProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NugetPackageVersionUpdater/Microsoft.ML.NugetPackageVersionUpdater.csproj
       versionFilePath: $(Build.SourcesDirectory)/test/Microsoft.ML.NugetPackageVersionUpdater/latest_versions.txt
       PROCDUMP_PATH: '$(Build.SourcesDirectory)/Tools/ProcDump/'
+      ${{ if eq(parameters.buildScript, 'build.cmd') }}:
+        spaceValue: ' '
+      ${{ if eq(parameters.buildScript, './build.sh') }}:
+        spaceValue: '%20'
     strategy:
       matrix:
         ${{ if eq(parameters.customMatrixes, '') }}:
@@ -116,7 +119,7 @@ jobs:
           - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci #-coverage=${{ parameters.codeCoverage }}
             displayName: Run All Tests.
         - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
-          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments='-trait${{ parameters.spaceValue }}Category=RunSpecificTest' #-coverage=${{ parameters.codeCoverage }}
+          - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments='-trait$(spaceValue)Category=RunSpecificTest' #-coverage=${{ parameters.codeCoverage }}
             displayName: Run Specific Tests.
         - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
           - task: VSTest@2
@@ -140,7 +143,7 @@ jobs:
               collectDumpOn: onAbortOnly
               publishRunAttachments: true
       - ${{ if eq(parameters.innerLoop, 'true') }}:
-        - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments='-notrait${{ parameters.spaceValue }}Category=SkipInCI' #-coverage=${{ parameters.codeCoverage }}
+        - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments='-notrait$(spaceValue)Category=SkipInCI' #-coverage=${{ parameters.codeCoverage }}
           displayName: Run CI Tests.
     - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
       displayName: Upload coverage to codecov.io