Fix coverage publishing conditionals (#4498)

Author: BruceHaley

build/yaml/botbuilder-dotnet-ci.yml

@@ -62,15 +62,15 @@ stages:
     variables:
       BuildConfiguration: Release-Windows
       BuildTarget: 'netcoreapp21' # set the TargetFramework property for tests to use netcoreapp2.1
-      NoCoverageUpload: true
+      PublishCoverage: true
     steps:
     - template: ci-build-steps.yml
     - template: ci-test-steps.yml
   - job: Release_Windows_Configuration_31
     variables:
       BuildConfiguration: Release-Windows
       BuildTarget: 'netcoreapp31' # set the TargetFramework property for tests to use netcoreapp3.1
-      NoCoverageUpload: true
+      PublishCoverage: true
     steps:
     - template: ci-build-steps.yml
     - template: ci-test-steps.yml

build/yaml/ci-test-steps.yml

@@ -1,6 +1,6 @@
 #variables:
 #  DotNetCoverallsToken: define this in Azure
-#  NoCoverageUpload: (optional) define this in Azure. Default = false.
+#  PublishCoverage: (optional) set to true in the calling template.
 steps:
 - powershell: |
    Remove-Item CodeCoverage -Force -Recurse -ErrorAction Ignore
@@ -58,7 +58,7 @@ steps:
 - powershell: 'echo ''##vso[task.setvariable variable=CoverallsToken]$(DotNetCoverallsToken)'''
   displayName: 'Set CoverallsToken for PublishToCoveralls.ps1 if token exists'
   continueOnError: true
-  condition: and(succeeded(), ne(variables['NoCoverageUpload'], 'true'), eq(variables['BuildConfiguration'],'Release-Windows'))
+  condition: and(succeeded(), eq(variables['PublishCoverage'], 'true'))
 
 - task: PowerShell@2
   displayName: 'Upload Coverage Files to Coveralls.io https://coveralls.io/github/microsoft/botbuilder-dotnet'
@@ -67,7 +67,7 @@ steps:
     filePath: '$(Build.SourcesDirectory)\build\PublishToCoveralls.ps1'
     arguments: '-pathToCoverageFiles "$(Build.SourcesDirectory)\CodeCoverage" -serviceName "master CI-PR"'
   continueOnError: true
-  condition: and(succeeded(), ne(variables['CoverallsToken'], ''), ne(variables['NoCoverageUpload'], 'true'), eq(variables['BuildConfiguration'],'Release-Windows'))
+  condition: and(succeeded(), eq(variables['PublishCoverage'], 'true'))
 
 - task: PublishBuildArtifacts@1
   displayName: 'Publish build artifact CodeCoverage'