Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
peombwa committed Mar 11, 2021
2 parents 8135056 + dfed466 commit 4497255
Show file tree
Hide file tree
Showing 129 changed files with 19,935 additions and 16,858 deletions.
5 changes: 4 additions & 1 deletion .azure-pipelines/common-templates/download-openapi-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ parameters:
- name: BaseBranch
type: string
default: "dev"
- name: BuildAgent
default: MsGraphBuildAgentsWindows
displayName: Build Agent

jobs:
- job: GetLatestDocs
displayName: Download OpenApiDocs
pool: MsGraphDevXAzureAgents
pool: $(BuildAgent)
steps:
- template: ./checkout.yml

Expand Down
3 changes: 1 addition & 2 deletions .azure-pipelines/generate-auth-module-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ parameters:
jobs:
- job: MsGraphPSSDKAuthModuleGeneration
displayName: Microsoft Graph PowerShell SDK Auth Module Generation
pool: MsGraphDevXAzureAgents


steps:
- template: ./install-tools-template.yml

Expand Down
1 change: 0 additions & 1 deletion .azure-pipelines/generate-modules-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ parameters:
jobs:
- job: MsGraphPSSDKServiceModulesGeneration
displayName: Microsoft Graph PowerShell SDK Service Module Generation
pool: MsGraphDevXAzureAgents
timeoutInMinutes: 600

steps:
Expand Down
1 change: 0 additions & 1 deletion .azure-pipelines/generate-rollup-module-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ parameters:
jobs:
- job: MsGraphPSSDKRollUpModuleGeneration
displayName: Microsoft Graph PowerShell SDK Roll-Up Module Generation
pool: MsGraphDevXAzureAgents
timeoutInMinutes: 600

steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ parameters:
- name: PublishToFeed
type: boolean
default: false

jobs:
- job: GenerateServiceModules
displayName: Service module generation
pool: MsGraphDevXAzureAgents
timeoutInMinutes: 360
condition: and(succeeded(), ne(stageDependencies.DownloadOpenAPIDocs.GetLatestDocs.outputs['OpenAPIDocDiff.ModulesWithChanges'], ''))
variables:
Expand Down
7 changes: 6 additions & 1 deletion .azure-pipelines/install-tools-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ steps:
debugMode: false
version: 3.x

- task: UseDotNet@2
displayName: 'Use .NET Core SDK 5.x'
inputs:
debugMode: false
version: 5.x

- task: NuGetToolInstaller@1
displayName: 'Install Nuget 5.7'
inputs:
Expand All @@ -28,7 +34,6 @@ steps:
targetType: inline
script: |
dotnet tool update --global PowerShell
pwsh
- task: PowerShell@2
displayName: 'Version Check'
Expand Down
22 changes: 19 additions & 3 deletions .azure-pipelines/integrated-pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.

parameters:
- name: BuildAgent
default: MsGraphBuildAgentsWindows
displayName: Build Agent

- name: AzureSubscription
default: "Microsoft Graph Build Agents (Win+Lin)"
displayName: Azure Subscription

- name: KeyVault
default: "msgraph-build-keyvault"
displayName: Build Key vault

variables:
AUTH_MODULE_NAME: 'Authentication'
AUTH_MODULE_PATH: 'src\Authentication\Authentication'
Expand All @@ -17,8 +30,11 @@ variables:
GitUserEmail: 'GraphTooling@service.microsoft.com'
GitUserName: 'Microsoft Graph DevX Tooling'
BUILDNUMBER: -1
BUILDAGENT: ${{ parameters.BuildAgent }}
AZURESUBSCRIPTION: ${{ parameters.AzureSubscription }}
KEYVAULT: ${{ parameters.KeyVault }}

pool: MsGraphDevXAzureAgents
pool: $(BUILDAGENT)

trigger:
branches:
Expand Down Expand Up @@ -54,8 +70,8 @@ stages:
steps:
- task: AzureKeyVault@1
inputs:
azureSubscription: 'Microsoft Graph Build Agents'
KeyVaultName: 'msgraph-build-vault'
azureSubscription: $(AZURESUBSCRIPTION)
KeyVaultName: $(KEYVAULT)
SecretsFilter: '*'
RunAsPreJob: true

Expand Down
3 changes: 0 additions & 3 deletions .azure-pipelines/security-postchecks-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
jobs:
- job: MsGraphPSSDKSecurityPostChecks
displayName: Microsoft Graph PowerShell SDK Security Post Checks
pool:
image: windows-latest
timeoutInMinutes: 600

steps:
- task: CodesignValidation@0
Expand Down
2 changes: 0 additions & 2 deletions .azure-pipelines/security-prechecks-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
jobs:
- job: MsGraphPSSDKSecurityPreChecks
displayName: Microsoft Graph PowerShell SDK Security Pre Checks
pool: MsGraphDevXAzureAgents
timeoutInMinutes: 600

steps:
- task: CredScan@2
displayName: 'Run CredScan'
Expand Down
11 changes: 10 additions & 1 deletion .azure-pipelines/weekly-generation.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.


name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
pool: MsGraphDevXAzureAgents

parameters:
- name: BuildAgent
default: MsGraphBuildAgentsWindows
displayName: Build Agent

variables:
Branch: "WeeklyOpenApiDocsDownload"
BaseBranch: "dev"
BUILDAGENT: ${{ parameters.BuildAgent }}

pool: $(BUILDAGENT)

trigger: none
pr: none
schedules:
Expand Down
2 changes: 1 addition & 1 deletion config/ModuleMetadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
],
"releaseNotes": "See https://aka.ms/GraphPowerShell-Release.",
"assemblyOriginatorKeyFile": "35MSSharedLib1024.snk",
"version": "1.4.0"
"version": "1.4.1"
}
5 changes: 4 additions & 1 deletion openApiDocs/v1.0/Applications.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6891,7 +6891,7 @@ components:
items:
type: string
nullable: true
description: 'The list of single sign-on modes supported by this application. The supported values are password, saml, external, and oidc.'
description: 'The list of single sign-on modes supported by this application. The supported values are oidc, password, saml, and notSupported.'
additionalProperties:
type: object
microsoft.graph.applicationServicePrincipal:
Expand Down Expand Up @@ -6969,6 +6969,7 @@ components:
description: 'Used to retrieve service principals by subscription, identify resource group and full resource ids for managed identities.'
appDescription:
type: string
description: The description exposed by the associated application.
nullable: true
appDisplayName:
type: string
Expand Down Expand Up @@ -6998,6 +6999,7 @@ components:
description: The roles exposed by the application which this service principal represents. For more information see the appRoles property definition on the application entity. Not nullable.
description:
type: string
description: Free text field to provide an internal end-user facing description of the service principal. End-user portals such MyApps will display the application description in this field. The maximum allowed size is 1024 characters.
nullable: true
displayName:
type: string
Expand All @@ -7024,6 +7026,7 @@ components:
nullable: true
notes:
type: string
description: 'Free text field to capture information about the service principal, typically used for operational purposes. Maximum allowed size is 1024 characters.'
nullable: true
notificationEmailAddresses:
type: array
Expand Down
1 change: 1 addition & 0 deletions openApiDocs/v1.0/CloudCommunications.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4085,6 +4085,7 @@ components:
properties:
conferenceId:
type: string
description: The conference id of the online meeting.
nullable: true
dialinUrl:
type: string
Expand Down
12 changes: 11 additions & 1 deletion openApiDocs/v1.0/Devices.CloudPrint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4404,6 +4404,7 @@ components:
type: array
items:
$ref: '#/components/schemas/microsoft.graph.printOperation'
description: The list of print long running operations.
printers:
type: array
items:
Expand All @@ -4423,6 +4424,7 @@ components:
type: array
items:
$ref: '#/components/schemas/microsoft.graph.printTaskDefinition'
description: List of abstract definition for a task that can be triggered when various events occur within Universal Print.
additionalProperties:
type: object
microsoft.graph.printConnector:
Expand Down Expand Up @@ -5514,23 +5516,28 @@ components:
$ref: '#/components/schemas/microsoft.graph.printerDefaults'
displayName:
type: string
description: The name of the printer/printerShare.
isAcceptingJobs:
type: boolean
description: Whether the printer/printerShare is currently accepting new print jobs.
nullable: true
location:
$ref: '#/components/schemas/microsoft.graph.printerLocation'
manufacturer:
type: string
description: The manufacturer of the printer/printerShare.
nullable: true
model:
type: string
description: The model name of the printer/printerShare.
nullable: true
status:
$ref: '#/components/schemas/microsoft.graph.printerStatus'
jobs:
type: array
items:
$ref: '#/components/schemas/microsoft.graph.printJob'
description: The list of jobs that are queued for printing by the printer/printerShare.
additionalProperties:
type: object
microsoft.graph.printEvent:
Expand Down Expand Up @@ -7444,7 +7451,7 @@ components:
type: array
items:
$ref: '#/components/schemas/microsoft.graph.managedAppPolicy'
description: Zero or more policys already applied on the registered app when it last synchronized with managment service.
description: Zero or more policys already applied on the registered app when it last synchronized with management service.
intendedPolicies:
type: array
items:
Expand Down Expand Up @@ -10460,6 +10467,7 @@ components:
properties:
conferenceId:
type: string
description: The conference id of the online meeting.
nullable: true
dialinUrl:
type: string
Expand Down Expand Up @@ -12622,6 +12630,7 @@ components:
$ref: '#/components/schemas/microsoft.graph.identitySet'
description:
type: string
description: Verbose description of the application.
nullable: true
displayName:
type: string
Expand All @@ -12636,6 +12645,7 @@ components:
$ref: '#/components/schemas/microsoft.graph.teamsAppPublishingState'
shortDescription:
type: string
description: Short description of the application.
nullable: true
teamsAppId:
type: string
Expand Down
2 changes: 1 addition & 1 deletion openApiDocs/v1.0/Devices.CorporateManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11608,7 +11608,7 @@ components:
type: array
items:
$ref: '#/components/schemas/microsoft.graph.managedAppPolicy'
description: Zero or more policys already applied on the registered app when it last synchronized with managment service.
description: Zero or more policys already applied on the registered app when it last synchronized with management service.
intendedPolicies:
type: array
items:
Expand Down
5 changes: 4 additions & 1 deletion openApiDocs/v1.0/Education.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9115,7 +9115,7 @@ components:
type: array
items:
$ref: '#/components/schemas/microsoft.graph.managedAppPolicy'
description: Zero or more policys already applied on the registered app when it last synchronized with managment service.
description: Zero or more policys already applied on the registered app when it last synchronized with management service.
intendedPolicies:
type: array
items:
Expand Down Expand Up @@ -11798,6 +11798,7 @@ components:
properties:
conferenceId:
type: string
description: The conference id of the online meeting.
nullable: true
dialinUrl:
type: string
Expand Down Expand Up @@ -13662,6 +13663,7 @@ components:
$ref: '#/components/schemas/microsoft.graph.identitySet'
description:
type: string
description: Verbose description of the application.
nullable: true
displayName:
type: string
Expand All @@ -13676,6 +13678,7 @@ components:
$ref: '#/components/schemas/microsoft.graph.teamsAppPublishingState'
shortDescription:
type: string
description: Short description of the application.
nullable: true
teamsAppId:
type: string
Expand Down
5 changes: 4 additions & 1 deletion openApiDocs/v1.0/Files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15992,7 +15992,7 @@ components:
type: array
items:
$ref: '#/components/schemas/microsoft.graph.managedAppPolicy'
description: Zero or more policys already applied on the registered app when it last synchronized with managment service.
description: Zero or more policys already applied on the registered app when it last synchronized with management service.
intendedPolicies:
type: array
items:
Expand Down Expand Up @@ -17999,6 +17999,7 @@ components:
properties:
conferenceId:
type: string
description: The conference id of the online meeting.
nullable: true
dialinUrl:
type: string
Expand Down Expand Up @@ -20540,6 +20541,7 @@ components:
$ref: '#/components/schemas/microsoft.graph.identitySet'
description:
type: string
description: Verbose description of the application.
nullable: true
displayName:
type: string
Expand All @@ -20554,6 +20556,7 @@ components:
$ref: '#/components/schemas/microsoft.graph.teamsAppPublishingState'
shortDescription:
type: string
description: Short description of the application.
nullable: true
teamsAppId:
type: string
Expand Down
5 changes: 4 additions & 1 deletion openApiDocs/v1.0/Groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25697,6 +25697,7 @@ components:
$ref: '#/components/schemas/microsoft.graph.identitySet'
description:
type: string
description: Verbose description of the application.
nullable: true
displayName:
type: string
Expand All @@ -25711,6 +25712,7 @@ components:
$ref: '#/components/schemas/microsoft.graph.teamsAppPublishingState'
shortDescription:
type: string
description: Short description of the application.
nullable: true
teamsAppId:
type: string
Expand Down Expand Up @@ -26942,7 +26944,7 @@ components:
type: array
items:
$ref: '#/components/schemas/microsoft.graph.managedAppPolicy'
description: Zero or more policys already applied on the registered app when it last synchronized with managment service.
description: Zero or more policys already applied on the registered app when it last synchronized with management service.
intendedPolicies:
type: array
items:
Expand Down Expand Up @@ -28812,6 +28814,7 @@ components:
properties:
conferenceId:
type: string
description: The conference id of the online meeting.
nullable: true
dialinUrl:
type: string
Expand Down
Loading

0 comments on commit 4497255

Please sign in to comment.