Merge branch 'main' into dkershaw10-doc-updates

Author: dkershaw10

pipelines/common-templates/common-steps.yml

@@ -79,7 +79,7 @@ steps:
       TargetFolder: "$(Build.ArtifactStagingDirectory)/generated"
 
   - task: PublishBuildArtifacts@1
-    displayName: 'Publish Files'
+    displayName: 'Publish Files: $(ArtifactName)'
     inputs:
-      ArtifactName: 'GeneratedFiles'
+      ArtifactName: '$(ArtifactName)'
       PathtoPublish: '$(Build.ArtifactStagingDirectory)'

pipelines/common-templates/esrp/codesign-nuget.yml

@@ -1,21 +1,13 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-parameters:
-  - name: FolderPath
-    type: string
-    default: $(Build.ArtifactStagingDirectory)
-  - name: Pattern
-    type: string
-    default: "*.nupkg"
-
 steps:
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     displayName: "ESRP CodeSigning Nuget Packages"
     inputs:
       ConnectedServiceName: "microsoftgraph ESRP CodeSign DLL and NuGet (AKV)"
-      FolderPath: ${{ parameters.FolderPath }}
-      Pattern: ${{ parameters.Pattern }}}
+      FolderPath: "$(Build.ArtifactStagingDirectory)"
+      Pattern: "*.nupkg"
       signConfigType: inlineSignParams
       inlineOperation: |
         [

pipelines/common-variables.yml

@@ -4,6 +4,7 @@
 variables:
   BuildPlatform: "Any CPU"
   BuildConfiguration: "Release"
+  ArtifactName: "GeneratedFiles"
   ProductBinPath: '$(Build.SourcesDirectory)/src/Microsoft.Graph.Bicep.Types/bin/$(BuildConfiguration)'
   BuildSolution: '$(Build.SourcesDirectory)/Microsoft.Graph.Bicep.Types.sln'
   SwaggerFilePath: '$(Build.SourcesDirectory)/swagger/specification/microsoftgraph/resource-manager/microsoftgraph/preview/2023-09-15-preview'

pipelines/productionBuild.yml

@@ -47,12 +47,12 @@ stages:
                 - task: DownloadPipelineArtifact@2
                   displayName: Download nupkg from artifacts
                   inputs:
-                    artifact: Nugets
+                    artifact: "$(ArtifactName)"
                     source: current
                 - task: NuGetCommand@2
                   displayName: "NuGet push"
                   inputs:
                     command: push
-                    packagesToPush: "$(Pipeline.Workspace)/Nugets/Microsoft.Graph.Bicep.Types.*.nupkg"
+                    packagesToPush: "$(Pipeline.Workspace)/$(ArtifactName)/Microsoft.Graph.Bicep.Types.*.nupkg"
                     nuGetFeedType: external
                     publishFeedCredentials: "microsoftgraph NuGet connection"