From 519e8f5e04f403ca5bd82805997ceda11bd1cfd5 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Sun, 4 Oct 2020 19:31:29 -0600 Subject: [PATCH] Add MacOSX --- azure-pipelines/build.yml | 3 +-- azure-pipelines/publish-codecoverage.yml | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml index 7ee8c4eb..0048b2ba 100644 --- a/azure-pipelines/build.yml +++ b/azure-pipelines/build.yml @@ -38,7 +38,6 @@ jobs: CosmosDBConnectionString: $(CosmosDBConnectionString) - job: macOS - condition: false pool: vmImage: macOS-10.15 variables: @@ -59,7 +58,7 @@ jobs: dependsOn: - Windows - Linux -# - macOS + - macOS pool: ${{ parameters.windowsPool }} condition: succeededOrFailed() steps: diff --git a/azure-pipelines/publish-codecoverage.yml b/azure-pipelines/publish-codecoverage.yml index ffa99cf8..976f0781 100644 --- a/azure-pipelines/publish-codecoverage.yml +++ b/azure-pipelines/publish-codecoverage.yml @@ -7,10 +7,10 @@ steps: artifact: coverageResults-Linux displayName: Download Linux code coverage results continueOnError: true -# - download: current -# artifact: coverageResults-macOS -# displayName: Download macOS code coverage results -# continueOnError: true +- download: current + artifact: coverageResults-macOS + displayName: Download macOS code coverage results + continueOnError: true - powershell: | dotnet tool install --tool-path obj dotnet-reportgenerator-globaltool --version 4.2.2 --configfile azure-pipelines/justnugetorg.nuget.config Copy-Item -Recurse $(Pipeline.Workspace)/coverageResults-Windows/obj/* $(System.DefaultWorkingDirectory)/obj