Merge pull request #99 from microsoft/master

Update maint/maint-68 for fix for Windows symbols publishing
microsoft · Apr 15, 2021 · 2c38ac0 · 2c38ac0
2 parents e5d6518 + 7b46fba
commit 2c38ac0
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/build/azure-nuget.yml b/build/azure-nuget.yml
@@ -416,25 +416,6 @@ stages:
         artifactName: 'linux-arm64'
         downloadPath: '$(Build.BINARIESDIRECTORY)\bits'
 
-    # Symbols (PDBs)
-    - task: DownloadBuildArtifacts@0
-      displayName: 'Download symbols-win-x86'
-      inputs:
-        artifactName: 'symbols-win-x86'
-        downloadPath: '$(Build.BINARIESDIRECTORY)\symbols'
-
-    - task: DownloadBuildArtifacts@0
-      displayName: 'Download symbols-win-x64'
-      inputs:
-        artifactName: 'symbols-win-x64'
-        downloadPath: '$(Build.BINARIESDIRECTORY)\symbols'
-
-    - task: DownloadBuildArtifacts@0
-      displayName: 'Download symbols-win-ARM64'
-      inputs:
-        artifactName: 'symbols-win-ARM64'
-        downloadPath: '$(Build.BINARIESDIRECTORY)\symbols'
-
     - powershell: |
         Write-Host ""
         Write-Host "$(BUILD.BINARIESDIRECTORY)"
@@ -470,8 +451,7 @@ stages:
   - CreateNuget
   condition: and(eq(variables.codeSign, true), and(in(dependencies.CodeSignBinaries.result, 'Succeeded'), in(dependencies.CreateNuget.result, 'Succeeded')))
   pool:
-    name: Azure Pipelines
-    vmImage: 'windows-2019'
+    name: Package ES CodeHub Lab E
   variables:
     BuildPlatform: AnyCPU
 
@@ -555,6 +535,31 @@ stages:
         PathtoPublish: '$(BUILD.ArtifactStagingDirectory)\nuget\Nuget_Packages'
         ArtifactName: 'Nuget_Packages_Signed'
 
+    # Symbols (PDBs)
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download symbols-win-x86'
+      inputs:
+        artifactName: 'symbols-win-x86'
+        downloadPath: '$(Build.BINARIESDIRECTORY)\symbols'
+
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download symbols-win-x64'
+      inputs:
+        artifactName: 'symbols-win-x64'
+        downloadPath: '$(Build.BINARIESDIRECTORY)\symbols'
+
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download symbols-win-ARM64'
+      inputs:
+        artifactName: 'symbols-win-ARM64'
+        downloadPath: '$(Build.BINARIESDIRECTORY)\symbols'
+
+    - powershell: |
+        Write-Host ""
+        Write-Host "$(BUILD.BINARIESDIRECTORY)"
+        Tree /F /A $(BUILD.BINARIESDIRECTORY)
+      displayName: 'DIAG: dir'
+
     # Publish the Windows Symbols to the public symbols server
     - task: PublishSymbols@2
       displayName: 'Publish Windows Symbols'