Adjuting jobs in pack template

Azure · Jul 7, 2022 · 9ab745d · 9ab745d
1 parent 803b169
commit 9ab745d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 34 deletions.
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
@@ -31,35 +31,6 @@ stages:
         BuildConfiguration: Release
         Arguments: $(ReleaseArguments)
         VmImage: $(VmImage)
-        GenerateSymbols: true
+        ReleasePackage: true
         OutputPath: '$(Build.ArtifactStagingDirectory)/bin/AnyCPU/$(BuildConfiguration)/Microsoft.Azure.Cosmos'
-
-    - job:
-      dependsOn: GenerateNugetPackages
-      pool:
-        vmImage: $(VmImage)
-
-      steps:
-      - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-        inputs:
-          BuildDropPath: '$(Build.ArtifactStagingDirectory)/bin/AnyCPU/$(BuildConfiguration)/Microsoft.Azure.Cosmos'
-
-      - task: AzureFileCopy@2
-        displayName: ' Copy Artifacts to Azure SDK Release blob storage'
-        condition: and(succeeded(),ne(variables['BlobVersion'], ''))
-        inputs:
-          SourcePath: '$(Build.ArtifactStagingDirectory)/bin/AnyCPU/$(BuildConfiguration)/Microsoft.Azure.Cosmos'
-          azureSubscription: azuresdkpartnerdrops
-          Destination: AzureBlob
-          storage: azuresdkpartnerdrops
-          ContainerName: 'drops'
-          BlobPrefix: 'cosmosdb/csharp/$(BlobVersion)'
-
-      - task: PublishBuildArtifacts@1
-        displayName: 'Publish Artifacts: Microsoft.Azure.Cosmos'
-        inputs:
-          artifactName: Microsoft.Azure.Cosmos
-
-      - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-        displayName: 'Component Detection'
-#
+        BlobVersion: variables['BlobVersion']
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -34,7 +34,7 @@ jobs:
     BuildConfiguration: Release
     Arguments: $(ReleaseArguments)
     VmImage: $(VmImage)
-    GenerateSymbols: false
+    ReleasePackage: false
     OutputPath: '$(Build.ArtifactStagingDirectory)/bin/AnyCPU/Release/Microsoft.Azure.Cosmos'
 
 - template:  templates/build-ctl.yml

diff --git a/templates/nuget-pack.yml b/templates/nuget-pack.yml
@@ -6,7 +6,8 @@ parameters:
   VmImage: '' # https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops
   OS: 'Windows'
   OutputPath: ''
-  GenerateSymbols: true
+  ReleasePackage: false
+  BlobVersion: ''
 
 jobs:
 - job: GenerateNugetPackages
@@ -33,11 +34,33 @@ jobs:
       custom: pack
       arguments: '-v detailed -c ${{ parameters.BuildConfiguration }} --no-build --no-restore -o "${{ parameters.OutputPath }}"'
 
-  - ${{ if eq(parameters.GenerateSymbols, true) }}:
+  - ${{ if eq(parameters.ReleasePackage, true) }}:
     - task: DotNetCoreCLI@2
       displayName: 'Create SDK NuGet Symbols Package'
       inputs: 
         command: custom
         projects: 'Microsoft.Azure.Cosmos\src\Microsoft.Azure.Cosmos.csproj'
         custom: pack
         arguments: '-v detailed -c ${{ parameters.BuildConfiguration }} --no-build --include-symbols /p:SymbolPackageFormat=snupkg --no-restore -o "${{ parameters.OutputPath }}"'
+    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+      inputs:
+        BuildDropPath: '$(Build.ArtifactStagingDirectory)/bin/AnyCPU/$(BuildConfiguration)/Microsoft.Azure.Cosmos'
+
+    - task: AzureFileCopy@2
+      displayName: ' Copy Artifacts to Azure SDK Release blob storage'
+      condition: and(succeeded(),ne(parameters.BlobVersion, ''))
+      inputs:
+        SourcePath: '$(Build.ArtifactStagingDirectory)/bin/AnyCPU/$(BuildConfiguration)/Microsoft.Azure.Cosmos'
+        azureSubscription: azuresdkpartnerdrops
+        Destination: AzureBlob
+        storage: azuresdkpartnerdrops
+        ContainerName: 'drops'
+        BlobPrefix: 'cosmosdb/csharp/$(BlobVersion)'
+
+    - task: PublishBuildArtifacts@1
+      displayName: 'Publish Artifacts: Microsoft.Azure.Cosmos'
+      inputs:
+        artifactName: Microsoft.Azure.Cosmos
+
+    - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+      displayName: 'Component Detection'