Merge remote-tracking branch 'upstream/release/dev16.3-preview2' into...

Merge remote-tracking branch 'upstream/release/dev16.3-preview2' into merges/release/dev16.3-preview2-to-master

azure-pipelines-official.yml

@@ -11,8 +11,12 @@ resources:
 #  IbcSourceBranchName: 'default'
 #  IbcDropId: 'default'
 
-jobs:
-- job: OfficialBuild
+stages:
+- stage: build
+  displayName: Build and Test
+
+  jobs:
+  - job: OfficialBuild
     displayName: Official Build
     pool:
       name: VSEng-MicroBuildVS2017
@@ -24,8 +28,10 @@ jobs:
 
     steps:
     - powershell: Write-Host "##vso[task.setvariable variable=SourceBranchName]$('$(Build.SourceBranch)'.Substring('refs/heads/'.Length))"
+      displayName: Setting SourceBranchName variable
 
     - powershell: Write-Host "##vso[task.setvariable variable=VisualStudio.DropName]Products/$(System.TeamProject)/$(Build.Repository.Name)/$(SourceBranchName)/$(Build.BuildNumber)"
+      displayName: Setting VisualStudio.DropName variable
 
     - task: NuGetToolInstaller@0
       inputs:
@@ -191,12 +197,13 @@ jobs:
         ArtifactName: 'VSSetup'
       condition: succeeded()
 
-  # Archive NuGet packages to DevOps.
+    # Publish our NuPkgs as an artifact. The name of this artifact must be PackageArtifacts as the 
+    # arcade templates depend on the name.
     - task: PublishBuildArtifacts@1
       displayName: Publish Artifact Packages
       inputs:
         PathtoPublish: 'artifacts\packages\$(BuildConfiguration)'
-      ArtifactName: 'Packages'
+        ArtifactName: 'PackageArtifacts'
       condition: succeeded()
 
     # Publish Asset Manifests for Build Asset Registry job
@@ -218,10 +225,18 @@ jobs:
       displayName: Perform Cleanup Tasks
       condition: succeededOrFailed()
 
-# Publish to Build Asset Registry
-- template: /eng/common/templates/job/publish-build-assets.yml
+  # Publish to Build Asset Registry
+  - template: /eng/common/templates/job/publish-build-assets.yml
     parameters:
       dependsOn:
         - OfficialBuild
       queue:
         name: Hosted VS2017
+
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+  - template: eng\common\templates\post-build\post-build.yml
+    parameters:
+      # Symbol validation is not entirely reliable as of yet, so should be turned off until
+      # https://github.com/dotnet/arcade/issues/2871 is resolved.
+      enableSymbolValidation: false
+      enableSourceLinkValidation: false
\ No newline at end of file

eng/Versions.props

@@ -53,7 +53,7 @@
     <MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.18</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
     <MicrosoftCodeAnalysisVisualBasicCodeFixTestingXUnitVersion>$(MicrosoftCodeAnalysisTestingVersion)</MicrosoftCodeAnalysisVisualBasicCodeFixTestingXUnitVersion>
     <MicrosoftCodeAnalysisVisualBasicCodeStyleVersion>$(CodeStyleAnalyzerVersion)</MicrosoftCodeAnalysisVisualBasicCodeStyleVersion>
-    <MicrosoftCodeAnalysisFlowAnalysisUtilitiesVersion>2.9.4-beta2.19365.1+a6bc06eb</MicrosoftCodeAnalysisFlowAnalysisUtilitiesVersion>
+    <MicrosoftCodeAnalysisFlowAnalysisUtilitiesVersion>2.9.4</MicrosoftCodeAnalysisFlowAnalysisUtilitiesVersion>
     <MicrosoftCodeQualityAnalyzersVersion>$(RoslynDiagnosticsNugetPackageVersion)</MicrosoftCodeQualityAnalyzersVersion>
     <SystemCompositionVersion>1.0.31</SystemCompositionVersion>
     <MicrosoftCSharpVersion>4.3.0</MicrosoftCSharpVersion>