Merge to main

.azure-pipelines/ci-build.yml

@@ -2,86 +2,161 @@
 # Licensed under the MIT License.
 name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
 parameters:
-  - name: BuildAgent
-    default: 1es-windows-ps-compute
-    displayName: Build Agent
-  - name: Test
-    type: boolean
-    default: true
-  - name: Pack
-    type: boolean
-    default: true
-  - name: Sign
-    type: boolean
-    default: true
+- name: BuildAgent
+  default: 1es-windows-ps-compute-m
+  displayName: Build Agent
+- name: Test
+  type: boolean
+  default: true
+- name: Pack
+  type: boolean
+  default: true
+- name: Sign
+  type: boolean
+  default: true
+- name: InternalFeed
+  type: string
+  default: '0985d294-5762-4bc2-a565-161ef349ca3e/PowerShell_V2_Build'
+  displayName: Internal NuGet Feed
+  values:
+    - '0985d294-5762-4bc2-a565-161ef349ca3e/PowerShell_v2'
+    - 'ATPopFeed'
+    - '0985d294-5762-4bc2-a565-161ef349ca3e/PowerShell_V2_Build'
 
 variables:
   BuildAgent: ${{ parameters.BuildAgent }}
   GitUserEmail: "[email protected]"
   GitUserName: "Microsoft Graph DevX Tooling"
 
-pool: $(BuildAgent)
-
 trigger:
   branches:
     include:
-      - main
-      - dev
+    - main
+    - dev
 pr:
   branches:
     include:
-      - main
-      - dev
-
-jobs:
-  - job: MsGraphPsSdkCiBuild
-    displayName: Microsoft Graph PowerShell SDK CI Build
-    timeoutInMinutes: 840
-    steps:
-      - script: |
-          git submodule update --init --recursive
-      - template: ./common-templates/install-tools.yml
-      - template: ./common-templates/security-pre-checks.yml
-
-      - template: ./generation-templates/authentication-module.yml
-        parameters:
-          Test: ${{ parameters.Test }}
-          Pack: ${{ parameters.Pack }}
-          Sign: ${{ parameters.Sign }}
+    - main
+    - dev
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    pool: $(BuildAgent)
+    sdl:
+      binskim:
+        enabled: false
+        justificationForDisabling: "Binskim keeps on crushing and failing the weekly build pipeline. Disabling it for now because we are unable to publish the artifacts to internal feeds."
+      credscan:
+        suppressionsFile: $(Build.SourcesDirectory)/.azure-pipelines/config/credscan/credscan-suppressions.json
+      policheck:
+        exclusionFile: $(Build.SourcesDirectory)/.azure-pipelines/config/policheck/policheck-exclusions.xml
+    customBuildTags:
+    - ES365AIMigrationTooling
+    stages:
+    - stage: stage
+      jobs:
+      - job: MsGraphPsSdkCiBuild
+        displayName: Microsoft Graph PowerShell SDK CI Build
+        timeoutInMinutes: 840
+        templateContext:
+          outputs:
+          - ${{ if and(eq(parameters.Pack, true), eq(parameters.Sign, true)) }}:
+            - output: pipelineArtifact
+              displayName: 'Publish Module Artifacts'
+              targetPath: '$(Build.ArtifactStagingDirectory)'
+              artifactName: 'drop'
+              publishLocation: 'Container'
+        steps:
+        - script: |
+            git submodule update --init --recursive
+        - template: .azure-pipelines/common-templates/install-tools.yml@self
+        - template: .azure-pipelines/common-templates/security-pre-checks.yml@self
+
+        - template: .azure-pipelines/generation-templates/authentication-module.yml@self
+          parameters:
+            Test: ${{ parameters.Test }}
+            Pack: ${{ parameters.Pack }}
+            Sign: ${{ parameters.Sign }}
 
-      - template: ./generation-templates/workload-modules.yml
-        parameters:
-          Test: ${{ parameters.Test }}
-          Pack: ${{ parameters.Pack }}
-          Sign: ${{ parameters.Sign }}
+        - template: .azure-pipelines/generation-templates/workload-modules.yml@self
+          parameters:
+            Test: ${{ parameters.Test }}
+            Pack: ${{ parameters.Pack }}
+            Sign: ${{ parameters.Sign }}
 
-      - template: ./generation-templates/meta-module.yml
-        parameters:
-          Test: ${{ parameters.Test }}
-          Pack: ${{ parameters.Pack }}
-          Sign: ${{ parameters.Sign }}
+        - template: .azure-pipelines/generation-templates/meta-module.yml@self
+          parameters:
+            Test: ${{ parameters.Test }}
+            Pack: ${{ parameters.Pack }}
+            Sign: ${{ parameters.Sign }}
 
-      - template: ./common-templates/guardian-analyzer.yml
+        - template: .azure-pipelines/common-templates/guardian-analyzer.yml@self
 
-      - ${{ if and(eq(parameters.Pack, true), eq(parameters.Sign, true)) }}:
-          - template: ./common-templates/esrp/codesign-nuget.yml
+        - ${{ if and(eq(parameters.Pack, true), eq(parameters.Sign, true)) }}:
+          - template: .azure-pipelines/common-templates/esrp/codesign-nuget.yml@self
             parameters:
               FolderPath: "$(Build.ArtifactStagingDirectory)"
               Pattern: "Microsoft.Graph*.nupkg"
 
-          - task: PublishBuildArtifacts@1
-            displayName: Publish Module Artifacts
-            inputs:
-              PathtoPublish: "$(Build.ArtifactStagingDirectory)"
-              ArtifactName: "drop"
-              publishLocation: "Container"
+        - template: .azure-pipelines/common-templates/security-post-checks.yml@self
+    - stage: 'Deploy_to_Internal_Feed'
+      dependsOn: stage
+      jobs:
+      - deployment: 'DeployToInternalFeed'
+        displayName: 'Deploy to Internal Feed'
+        environment: 'PowerShellInternalFeed'
+        strategy:
+          runOnce:
+            deploy:
+              steps:
+              - checkout: self
+              - task: DownloadPipelineArtifact@2
+                displayName: 'Download Build Artifacts'
+                inputs:
+                  buildType: 'current'
+                  targetPath: '$(System.DefaultWorkingDirectory)'
+              - task: 1ES.PublishNuget@1
+                displayName: 'Publish NuGet to feed'
+                inputs:
+                  useDotNetTask: false
+                  packageParentPath: '$(System.DefaultWorkingDirectory)'
+                  packagesToPush: '$(System.DefaultWorkingDirectory)/**/drop/**/*.nupkg'
+                  publishVstsFeed: ${{ parameters.InternalFeed }}
+                  nuGetFeedType: internal
+                  allowPackageConflicts: true
+    - stage: 'Deploy_to_PsGallery'
+      dependsOn: stage
+      condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) # Only deploy to PSGallery on main branch
+      jobs:
+      - deployment: 'DeployToPowerShellGallery'
+        displayName: 'Deploy to PowerShell Gallery'
+        environment: 'PowerShellGallery'
+        strategy:
+          runOnce:
+            deploy:
+              steps:
+              - checkout: self
+              - task: DownloadPipelineArtifact@2
+                displayName: 'Download Build Artifacts'
+                inputs:
+                  buildType: 'current'
+                  targetPath: '$(System.DefaultWorkingDirectory)'
+              - task: 1ES.PublishNuget@1
+                displayName: 'Publish NuGet to feed'
+                inputs:
+                  useDotNetTask: false
+                  packageParentPath: '$(System.DefaultWorkingDirectory)'
+                  packagesToPush: '$(System.DefaultWorkingDirectory)/**/drop/**/*.nupkg'
+                  nuGetFeedType: external
+                  publishFeedCredentials: 'microsoftgraph PowerShell Gallery connection'
+
+
 
-          - task: NuGetCommand@2
-            displayName: Publish NuGet to feed
-            inputs:
-              command: push
-              packagesToPush: $(Build.ArtifactStagingDirectory)/**/Microsoft.Graph.*.nupkg
-              publishVstsFeed: $(PROJECT_NAME)/$(FEED_NAME)
-              allowPackageConflicts: true
 
-      - template: ./common-templates/security-post-checks.yml
+

.azure-pipelines/generation-templates/generate-helpdocs-template.yml

@@ -9,7 +9,7 @@ parameters:
     type: string
     default: ""
   - name: BUILDAGENT
-    default: 1es-windows-ps-compute
+    default: 1es-windows-ps-compute-m
     displayName: Build Agent
 
 steps:

.azure-pipelines/weekly-generation.yml

@@ -10,7 +10,7 @@ name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
 parameters:
 - name: BuildAgent
   displayName: Build Agent
-  default: 1es-windows-ps-compute
+  default: 1es-windows-ps-compute-m
 - name: BaseBranch
   displayName: Base Branch
   default: dev

config/ModuleMetadata.json

@@ -27,15 +27,15 @@
   "versions": {
     "authentication": {
       "prerelease": "",
-      "version": "2.24.0"
+      "version": "2.25.0"
     },
     "beta": {
       "prerelease": "",
-      "version": "2.24.0"
+      "version": "2.25.0"
     },
     "v1.0": {
       "prerelease": "",
-      "version": "2.24.0"
+      "version": "2.25.0"
     }
   }
 }

config/ModulesMapping.jsonc

@@ -16,7 +16,7 @@
   "DeviceManagement.Enrollment": "^deviceManagement.(.*Enrollment.*|.*Autopilot.*|.*depOnboarding.*|importedDeviceIdentity|onPremisesConditionalAccessSettings|windowsFeatureUpdateProfile)$|^roleManagement.roleManagement$|^roleManagement.rbacApplicationMultiple$|^roleManagement.unifiedRbacApplication$",
   "DeviceManagement.Actions": "^deviceManagement.Actions$",
   "DeviceManagement.Functions": "^deviceManagement.Functions$",
-  "DirectoryObjects": "^directoryObjects\\.",
+   "DirectoryObjects": "^directoryObjects\\.|^directory.publicKeyInfrastructureRoot$",
   "Education": "^education\\.",
   "Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
   "Financials": "^financials\\.",

openApiDocs/beta/Applications.yml

@@ -12072,11 +12072,11 @@ paths:
     put:
       tags:
         - servicePrincipals.customClaimsPolicy
-      summary: Update customClaimsPolicy
-      description: Update a customClaimsPolicy object.
+      summary: Create or replace claimsPolicy
+      description: 'Create a new customClaimsPolicy object if it doesn''t exist, or replace an existing one.'
       externalDocs:
         description: Find more info here
-        url: https://learn.microsoft.com/graph/api/customclaimspolicy-update?view=graph-rest-beta
+        url: https://learn.microsoft.com/graph/api/serviceprincipal-put-claimspolicy?view=graph-rest-beta
       operationId: servicePrincipal_SetClaimsPolicy
       parameters:
         - name: servicePrincipal-id
@@ -12107,11 +12107,11 @@ paths:
     patch:
       tags:
         - servicePrincipals.customClaimsPolicy
-      summary: Update customClaimsPolicy
-      description: Update a customClaimsPolicy object.
+      summary: Create or replace claimsPolicy
+      description: 'Create a new customClaimsPolicy object if it doesn''t exist, or replace an existing one.'
       externalDocs:
         description: Find more info here
-        url: https://learn.microsoft.com/graph/api/customclaimspolicy-update?view=graph-rest-beta
+        url: https://learn.microsoft.com/graph/api/serviceprincipal-put-claimspolicy?view=graph-rest-beta
       operationId: servicePrincipal_UpdateClaimsPolicy
       parameters:
         - name: servicePrincipal-id
@@ -27321,7 +27321,7 @@ components:
               type: array
               items:
                 $ref: '#/components/schemas/microsoft.graph.appLogCollectionRequest'
-              description: The collection property of AppLogUploadRequest.
+              description: Indicates collection of App Log Upload Request.
               x-ms-navigationProperty: true
           additionalProperties:
             type: object
@@ -29491,11 +29491,11 @@ components:
       properties:
         key:
           type: string
-          description: Contains the name of the field that a value is associated with.
+          description: Key.
           nullable: true
         value:
           type: string
-          description: Contains the corresponding value for the specified key.
+          description: Value.
           nullable: true
       additionalProperties:
         type: object

openApiDocs/beta/Compliance.yml

@@ -15530,7 +15530,7 @@ components:
               type: array
               items:
                 $ref: '#/components/schemas/microsoft.graph.appLogCollectionRequest'
-              description: The collection property of AppLogUploadRequest.
+              description: Indicates collection of App Log Upload Request.
               x-ms-navigationProperty: true
           additionalProperties:
             type: object
@@ -26336,11 +26336,11 @@ components:
       properties:
         key:
           type: string
-          description: Contains the name of the field that a value is associated with.
+          description: Key.
           nullable: true
         value:
           type: string
-          description: Contains the corresponding value for the specified key.
+          description: Value.
           nullable: true
       additionalProperties:
         type: object

openApiDocs/beta/CrossDeviceExperiences.yml

@@ -10516,7 +10516,7 @@ components:
               type: array
               items:
                 $ref: '#/components/schemas/microsoft.graph.appLogCollectionRequest'
-              description: The collection property of AppLogUploadRequest.
+              description: Indicates collection of App Log Upload Request.
               x-ms-navigationProperty: true
           additionalProperties:
             type: object
@@ -13370,11 +13370,11 @@ components:
       properties:
         key:
           type: string
-          description: Contains the name of the field that a value is associated with.
+          description: Key.
           nullable: true
         value:
           type: string
-          description: Contains the corresponding value for the specified key.
+          description: Value.
           nullable: true
       additionalProperties:
         type: object