From f0039a64a7f46f1a9ed1c16f1c49be4449f49229 Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Fri, 22 Nov 2019 17:05:56 -0800
Subject: [PATCH] Fix build ymls (#8445)

* add publish mac args

* don't use minified

* continue on error

* no fancy error handling

* don't need continue on error specifier
---
 .../darwin/sql-product-build-darwin.yml       | 30 ++++++++++++++++++-
 .../linux/sql-product-build-linux.yml         |  2 +-
 .../win32/sql-product-build-win32.yml         | 10 +++----
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/build/azure-pipelines/darwin/sql-product-build-darwin.yml b/build/azure-pipelines/darwin/sql-product-build-darwin.yml
index aede0ce264..ae7cd169a3 100644
--- a/build/azure-pipelines/darwin/sql-product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/sql-product-build-darwin.yml
@@ -65,7 +65,7 @@ steps:
 
   - script: |
       set -e
-      yarn gulp vscode-darwin-min
+      yarn gulp vscode-darwin
     displayName: Build
 
   - script: |
@@ -159,6 +159,34 @@ steps:
     displayName: 'Get SHA256 Hashes'
     continueOnError: true
 
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: drop'
+
+  - task: PublishTestResults@2
+    displayName: 'Publish Test Results test-results.xml'
+    inputs:
+      testResultsFiles: 'test-results.xml'
+      searchFolder: '$(Build.SourcesDirectory)'
+    continueOnError: true
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+
+  - task: PublishTestResults@2
+    displayName: 'Publish Integration and Smoke Test Results'
+    inputs:
+      testResultsFiles: 'dawin-integration-tests-results.xml'
+      searchFolder: '$(Build.ArtifactStagingDirectory)\test-results'
+    continueOnError: true
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+
+  - task: PublishCodeCoverageResults@1
+    displayName: 'Publish code coverage from $(Build.SourcesDirectory)/.build/coverage/cobertura-coverage.xml'
+    inputs:
+      codeCoverageTool: Cobertura
+      summaryFileLocation: '$(Build.SourcesDirectory)/.build/coverage/cobertura-coverage.xml'
+      reportDirectory: '$(Build.SourcesDirectory)/.build/coverage'
+    continueOnError: true
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
diff --git a/build/azure-pipelines/linux/sql-product-build-linux.yml b/build/azure-pipelines/linux/sql-product-build-linux.yml
index 08f6f7d5e1..f9ad2e2a8c 100644
--- a/build/azure-pipelines/linux/sql-product-build-linux.yml
+++ b/build/azure-pipelines/linux/sql-product-build-linux.yml
@@ -74,7 +74,7 @@ steps:
 
   - script: |
       set -e
-      yarn gulp vscode-linux-x64-min
+      yarn gulp vscode-linux-x64
     displayName: Build
 
   - script: |
diff --git a/build/azure-pipelines/win32/sql-product-build-win32.yml b/build/azure-pipelines/win32/sql-product-build-win32.yml
index 061cf4e8a2..021f9a3366 100644
--- a/build/azure-pipelines/win32/sql-product-build-win32.yml
+++ b/build/azure-pipelines/win32/sql-product-build-win32.yml
@@ -28,11 +28,9 @@ steps:
     displayName: Prepare tooling
 
   - powershell: |
-      . build/azure-pipelines/win32/exec.ps1
-      $ErrorActionPreference = "Stop"
-      exec { git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git" }
-      exec { git fetch distro }
-      exec { git merge $(node -p "require('./package.json').distro") }
+      git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
+      git fetch distro
+      git merge $(node -p "require('./package.json').distro")
     displayName: Merge distro
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
@@ -72,7 +70,7 @@ steps:
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { yarn gulp "vscode-win32-x64-min" }
+      exec { yarn gulp "vscode-win32-x64" }
     displayName: Build
 
   - powershell: |