Fix issues with running PRs on Azure Pipelines

Author: natemcmaster

Directory.Build.targets

@@ -2,8 +2,8 @@
   <Target Name="UpdateCiSettings" Condition="'$(CI)' == 'true'">
     <Message Importance="High" Text="##vso[build.updatebuildnumber]$(PackageVersion)" />
     <!-- These tags can be used in Azure release pipelines to filter actions based on the type of build. -->
-    <Message Importance="high" Text="##vso[build.addbuildtag]daily-build" Condition=" '$(IsStableBuild)' != 'true' " />
-    <Message Importance="high" Text="##vso[build.addbuildtag]release-candidate" Condition=" '$(IsStableBuild)' == 'true' " />
-    <Message Importance="high" Text="##vso[build.addbuildtag]code-signed" Condition=" '$(CodeSign)' == 'true' " />
+    <Message Importance="high" Text="##vso[build.addbuildtag]daily-build" Condition=" '$(IsStableBuild)' != 'true' AND '$(BUILD_REASON)' != 'PullRequest' " />
+    <Message Importance="high" Text="##vso[build.addbuildtag]release-candidate" Condition=" '$(IsStableBuild)' == 'true' AND '$(BUILD_REASON)' != 'PullRequest' " />
+    <Message Importance="high" Text="##vso[build.addbuildtag]code-signed" Condition=" '$(CodeSign)' == 'true' AND '$(BUILD_REASON)' != 'PullRequest' " />
   </Target>
 </Project>

azure-pipelines.yml

@@ -7,12 +7,7 @@ pr:
 - '*'
 
 variables:
-# Set this to an empty value for pull-request builds
-- name: kv-access-token
-  value: ''
-# This contains secrets for accessing code-signing certificates during an official build
 - group: AzureKeyVault
-# Skip the package warm up step
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
   value: 1
 
@@ -25,8 +20,12 @@ jobs:
     displayName: Install .NET Core 2.2
     inputs:
       version: '2.2.102'
+  - powershell: ./build.ps1 -ci
+    displayName: Invoke build.ps1
+    condition: eq(variables['kv-access-token'], '')
   - powershell: ./build.ps1 -ci /p:AzureKeyVaultClientSecret=$(kv-access-token)
     displayName: Invoke build.ps1
+    condition: ne(variables['kv-access-token'], '')
   - task: PublishTestResults@2
     displayName: Upload test results
     condition: always()

build.ps1

@@ -75,7 +75,7 @@ exec dotnet pack --no-restore --no-build --configuration $Configuration -o $arti
 
 [string[]] $testArgs=@()
 if ($PSVersionTable.PSEdition -eq 'Core' -and -not $IsWindows) {
-    $testArgs += '--framework','netcoreapp2.1'
+    $testArgs += '--framework','netcoreapp2.2'
 }
 if ($env:TF_BUILD) {
     $testArgs += '--logger', 'trx'