Use latest download and publish artifacts approach (microsoft#341)

Uses syntactic sugar for downloading and publishing artifacts. Also replaces (Download|Publish)BuildArtifacts with (Download|Publish)PipelineArtifact.
rozele · Nov 18, 2020 · 4916f57 · 4916f57
1 parent 72b84c7
commit 4916f57
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 35 deletions.
diff --git a/.azdo/templates/jobs/build/cli.yml b/.azdo/templates/jobs/build/cli.yml
@@ -75,15 +75,11 @@ jobs:
       reportDirectory: $(Build.SourcesDirectory)/**/benchcovrepresults
       summaryFileLocation: '$(Build.SourcesDirectory)/**/coverage.cobertura.xml'
 
-  - task: PublishPipelineArtifact@1
+  - publish: $(Build.ArtifactStagingDirectory)/prerelease
     displayName: Publish prerelease NuGet packages
-    inputs:
-      artifactName: $(artifactNamePrerelease)
-      targetPath: $(Build.ArtifactStagingDirectory)/prerelease
+    artifact: $(artifactNamePrerelease)
 
-  - task: PublishPipelineArtifact@1
+  - publish: $(Build.ArtifactStagingDirectory)/release
     displayName: Publish release NuGet packages
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
-    inputs:
-      artifactName: $(artifactNameRelease)
-      targetPath: $(Build.ArtifactStagingDirectory)/release
+    artifact: $(artifactNameRelease)
diff --git a/.azdo/templates/jobs/build/extension.yml b/.azdo/templates/jobs/build/extension.yml
@@ -43,8 +43,5 @@ jobs:
       contents: '**/*.vsix'
       targetFolder: $(Build.ArtifactStagingDirectory)
 
-  - task: PublishPipelineArtifact@1
-    displayName: Publish extension packages
-    inputs:
-      artifactName: $(artifactName)
-      targetPath: $(Build.ArtifactStagingDirectory)
+  - publish: $(Build.ArtifactStagingDirectory)
+    artifact: $(artifactName)
diff --git a/.azdo/templates/jobs/nlu/cli.yml b/.azdo/templates/jobs/nlu/cli.yml
@@ -51,19 +51,19 @@ jobs:
         --service luis
         --delete-appsettings
 
-  - task: DownloadBuildArtifacts@0
-    condition: ne(variables['skipCompare'], 'true')
-    displayName: Download test results from master
+  - task: DownloadPipelineArtifact@2
+    condition: and(succeeded(), ne(variables['skipCompare'], 'true'))
+    displayName: Download NLU results from master
     inputs:
-      buildType: specific
+      source: specific
       project: $(System.TeamProject)
       pipeline: $(Build.DefinitionName)
-      buildVersionToDownload: latestFromBranch
-      branchName: refs/heads/master
-      artifactName: statistics
+      runVersion: latestFromBranch
+      runBranch: refs/heads/master
+      artifact: nlu
 
   - task: DotNetCoreCLI@2
-    condition: and(eq(variables['Build.Reason'], 'PullRequest'), ne(variables['skipCompare'], 'true'))
+    condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'), ne(variables['skipCompare'], 'true'))
     displayName: Compare the NLU text results with baseline
     inputs:
       command: custom
@@ -72,11 +72,11 @@ jobs:
         --expected models/tests.json
         --actual $(Build.ArtifactStagingDirectory)/results.json
         --test-settings models/compare.yml
-        --baseline $(System.ArtifactsDirectory)/$(nluResults)/statistics.json
+        --baseline $(Pipeline.Workspace)/nlu/statistics.json
         --output-folder $(Build.ArtifactStagingDirectory)
 
   - task: DotNetCoreCLI@2
-    condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['skipCompare'], 'true'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['skipCompare'], 'true')))
     displayName: Compare the NLU text results without baseline
     inputs:
       command: custom
@@ -94,8 +94,6 @@ jobs:
       testResultsFormat: NUnit
       testResultsFiles: $(Build.ArtifactStagingDirectory)/**/TestResult.xml
 
-  - task: PublishBuildArtifacts@1
-    displayName: Publish build artifacts
-    condition: succeededOrFailed()
-    inputs:
-      artifactName: statistics
+  - publish: $(Build.ArtifactStagingDirectory)
+    displayName: Publish NLU results
+    artifact: nlu
diff --git a/.azdo/templates/steps/install-dotnet-nlu.yml b/.azdo/templates/steps/install-dotnet-nlu.yml
@@ -10,31 +10,32 @@ steps:
       artifactName: artifactName
 
 # Note: only required when building dotnet-nlu from source
-- task: DownloadPipelineArtifact@2
+- download: current
   displayName: Download NuGet packages
-  inputs:
-    artifact: $(artifactName)
+  artifact: $(artifactName)
 
-# Note: only --add-source required when building dotnet-nlu from source
+# Note: --add-source and --version only required when building dotnet-nlu from source
 - task: DotNetCoreCLI@2
   displayName: Install dotnet-nlu
   inputs:
     command: custom
     custom: tool
     arguments: install dotnet-nlu
-      --add-source $(Pipeline.Workspace)
+      --add-source $(Pipeline.Workspace)/$(artifactName)
       --tool-path $(Agent.TempDirectory)/bin
+      --version $(nuget.version.prerelease)
 
-# Note: only --add-source required when building dotnet-nlu from source
+# Note: --add-source and --version only required when building dotnet-nlu from source
 - task: DotNetCoreCLI@2
   displayName: Install NLU provider
   condition: ne('${{ parameters.service }}', '')
   inputs:
     command: custom
     custom: tool
     arguments: install dotnet-nlu-${{ parameters.service }}
-      --add-source $(Pipeline.Workspace)
+      --add-source $(Pipeline.Workspace)/$(artifactName)
       --tool-path $(Agent.TempDirectory)/bin
+      --version $(nuget.version.prerelease)
 
 - bash: echo "##vso[task.prependpath]$(Agent.TempDirectory)/bin"
   displayName: Prepend .NET Core CLI tool path
diff --git a/.config/nuget.config b/.config/nuget.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <packageSources>
+    </packageSources>
+</configuration>