Merge branch 'main' into se-Build-Install-Dependencies

Author: SamErde

.azure-pipelines/1es-entra-powershell-ci-build.yml

@@ -19,6 +19,8 @@ resources:
     type: git
     name: 1ESPipelineTemplates/1ESPipelineTemplates
     ref: refs/heads/main
+variables:
+  - group: OData-ESRP-CodeSigning
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
@@ -32,6 +34,14 @@ extends:
         name: MSSecurity-1ES-Build-Agents-Pool
         image: MSSecurity-1ES-Windows-2022
         os: windows
+      credscan:
+        suppressionsFile: $(Build.SourcesDirectory)\.config\CredScanSuppressions.json
+        outputFormat: pre
+        debugMode: false
+        batchSize: 16
+      psscriptanalyzer:
+        break: false
+        enabled: true
     stages:
     - stage: build
       jobs:
@@ -42,15 +52,15 @@ extends:
           - template: .azure-pipelines/common-templates/install-tools.yml@self
           - template: .azure-pipelines/common-templates/security-pre-checks.yml@self
 
-          - template: .azure-pipelines/generation-templates/generate_adapter-migrate-1es.yml@self
+          - template: .azure-pipelines/generation-templates/generate_adapter-1es.yml@self
             parameters:
               Sign: ${{ parameters.Sign }}
 
           - ${{ if and(eq(parameters.Pack, true), eq(parameters.Sign, true)) }}:
-              - template: .azure-pipelines/common-templates/esrp/codesign-nuget-migrate.yml@self
+              - template: .azure-pipelines/common-templates/esrp/codesign-nuget.yml@self
                 parameters:
                   FolderPath: "$(Build.ArtifactStagingDirectory)"
-                  Pattern: "Microsoft.Graph.Entra.*.nupkg"
+                  Pattern: "Microsoft.Entra.*.nupkg"
               - task: 1ES.PublishBuildArtifacts@1
                 displayName: Publish Module Artifacts
                 inputs:
@@ -60,7 +70,7 @@ extends:
                 displayName: Publish NuGet to preview feed
                 inputs:
                   useDotNetTask: false
-                  packagesToPush: $(Build.ArtifactStagingDirectory)/**/Microsoft.Graph.Entra.*.nupkg
+                  packagesToPush: $(Build.ArtifactStagingDirectory)/**/Microsoft.Entra.*.nupkg
                   packageParentPath: '$(Build.ArtifactStagingDirectory)'
                   publishVstsFeed: $(PROJECT_NAME)/$(PREVIEW_FEED_NAME)
                   nuGetFeedType: internal

.azure-pipelines/1es-entra-powershell-pr.yml

@@ -0,0 +1,50 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+name: $(SourceBranchName)-PR-$(Date:yyyy-MM-dd)$(Rev:.r)
+
+trigger: none
+pr:
+  branches:
+    include:
+    - '*'
+
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/heads/main
+
+variables:
+  - group: OData-ESRP-CodeSigning
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    pool:
+      name: MSSecurity-1ES-Build-Agents-Pool
+      image: MSSecurity-1ES-Windows-2022
+      os: windows
+    sdl:
+      sourceAnalysisPool:
+        name: MSSecurity-1ES-Build-Agents-Pool
+        image: MSSecurity-1ES-Windows-2022
+        os: windows
+      credscan:
+        suppressionsFile: $(Build.SourcesDirectory)\.config\CredScanSuppressions.json
+        outputFormat: pre
+        debugMode: false
+        batchSize: 16
+      psscriptanalyzer:
+        break: false
+        enabled: true
+    stages:
+    - stage: Build
+      jobs:
+      - job: EntraPowerShellPRBuild
+        displayName: Entra PowerShell PR Build
+        steps:
+          - template: .azure-pipelines/generation-templates/generate_adapter-1es.yml@self
+            parameters:
+              Sign: false
+              

.azure-pipelines/1es-entra-powershell-release.yml

@@ -58,7 +58,7 @@ extends:
           displayName: Publish Nuget package
           inputs:
             useDotNetTask: false
-            packagesToPush: '$(System.ArtifactsDirectory)/drop/Microsoft.Graph.Entra*.nupkg'
+            packagesToPush: '$(System.ArtifactsDirectory)/drop/Microsoft.Entra*.nupkg'
             packageParentPath: '$(System.ArtifactsDirectory)'
             nuGetFeedType: external
             publishFeedCredentials: EntraPowerShell_PSGallery

.azure-pipelines/ci-build-migrate.yml

@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
 parameters:
@@ -10,19 +10,21 @@ parameters:
     default: "*.nupkg"
 
 steps:
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-    displayName: ESRP NuGet CodeSigning
-    enabled: true
-    inputs:
-      ConnectedServiceName: Federated DevX ESRP Managed Identity Connection
-      AppRegistrationClientId: 65035b7f-7357-4f29-bf25-c5ee5c3949f8
-      AppRegistrationTenantId: cdc5aeea-15c5-4db6-b079-fcadd2505dc2
-      AuthAKVName: akv-prod-eastus
-      AuthCertName: ReferenceLibraryPrivateCert
-      AuthSignCertName: ReferencePackagePublisherCertificate
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5 
+    displayName: 'NuGet CodeSigning' 
+    inputs: 
+      ConnectedServiceName: 'EntraPowerShell ESRP CodeSign and NUGET'
+      AppRegistrationClientId: '$(ODataEsrpAppRegistrationClientId)'
+      AppRegistrationTenantId: '$(ODataEsrpAppRegistrationTenantId)'
+      AuthAKVName: $(ODataEsrpAuthAKVName)
+      AuthCertName: $(ODataEsrpAuthCertName)
+      AuthSignCertName: $(ODataEsrpAuthSignCertName)
+      ServiceEndpointUrl: '$(ODataEsrpServiceEndpointUrl)'
       FolderPath: ${{ parameters.FolderPath }}
       Pattern: ${{ parameters.Pattern }}
-      signConfigType: inlineSignParams
+      SessionTimeout: 90
+      MaxConcurrency: 25
+      signConfigTYpe: 'inlineSignParams'
       inlineOperation: |
         [
             {
@@ -40,7 +42,3 @@ steps:
                 "toolVersion": "1.0"
             }
         ]
-      SessionTimeout: 20
-      MaxConcurrency: 50
-      MaxRetryAttempts: 5
-      PendingAnalysisWaitTimeoutMinutes: 5