Skip to content

Commit e824cfc

Browse files
committed
Merge branch 'dev'
2 parents 8735562 + 7ff6c07 commit e824cfc

File tree

114 files changed

+91825
-24333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+91825
-24333
lines changed

.azure-pipelines/common-templates/update-sdkversion.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ steps:
1414
Import-Module Microsoft.Graph -Global -Force
1515
}
1616
17-
- template: ../common-templates/checkout.yml
17+
- template: checkout.yml
18+
parameters:
19+
TargetBranch: "dev"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,5 @@ steps:
6969
script: |
7070
$Title = "[v1] Weekly Help Docs Generation"
7171
$Body = "This pull request was automatically created by Azure Pipelines. **Important** Check for unexpected deletions or changes in this PR."
72-
$BaseBranch = "${{ parameters.BaseBranch }}"
72+
$BaseBranch = "dev"
7373
. $(System.DefaultWorkingDirectory)/scripts/create-pull-request.ps1 -Title $Title -Body $Body -BaseBranchName $BaseBranch

.azure-pipelines/generation-templates/generate-service-modules.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ jobs:
172172
pwsh: true
173173
targetType: inline
174174
script: |
175+
git status
175176
$Title = "[v1] Weekly OpenApiDocs Refresh"
176177
$Body = "This pull request was automatically created by Azure Pipelines. **Important** Check for unexpected deletions or changes in this PR."
177-
$BaseBranch = "${{ parameters.BaseBranchName }}"
178-
Write-Host "Executing . $(System.DefaultWorkingDirectory)/scripts/create-pull-request.ps1 -Title $Title -Body $Body -BaseBranchName $BaseBranch"
178+
$BaseBranch = "dev"
179179
. $(System.DefaultWorkingDirectory)/scripts/create-pull-request.ps1 -Title $Title -Body $Body -BaseBranchName $BaseBranch
180180
181181
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1

.azure-pipelines/weekly-examples-update.yml

+25-6
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,26 @@ jobs:
3535
steps:
3636
- template: ./common-templates/update-sdkversion.yml
3737

38+
- task: PowerShell@2
39+
name: "ComputeBranch"
40+
displayName: "Compute weekly examples update branch name"
41+
inputs:
42+
targetType: inline
43+
script: |
44+
$branch = "{0}/{1}" -f "WeeklyExamplesUpdate", (Get-Date -Format yyyyMMddHHmm)
45+
Write-Host "Compute branch: $branch"
46+
Write-Host "##vso[task.setvariable variable=WeeklyExamplesBranch;isOutput=true]$branch"
47+
48+
- task: Bash@3
49+
displayName: "Create weekly examples branch"
50+
inputs:
51+
targetType: inline
52+
script: |
53+
git status
54+
git branch $(ComputeBranch.WeeklyExamplesBranch)
55+
git checkout $(ComputeBranch.WeeklyExamplesBranch)
56+
git status
57+
3858
- task: PowerShell@2
3959
displayName: 'Update Examples From Graph Reference'
4060
continueOnError: false
@@ -51,13 +71,10 @@ jobs:
5171
targetType: inline
5272
pwsh: true
5373
script: |
54-
git config --global user.email "[email protected]"
55-
git config --global user.name "Timothy Wamalwa"
56-
$date = Get-Date -Format "dd-MM-yyyy"
57-
$proposedBranch = "WeeklyExamplesUpdate/"+$date
74+
git status
5875
git add .
59-
git commit -m "Updating examples "+$date
60-
git push --set-upstream "https://$(GITHUB_TOKEN)@github.com/microsoftgraph/msgraph-sdk-powershell.git" $proposedBranch
76+
git commit -m "Updating examples"
77+
git push --set-upstream origin $(ComputeBranch.WeeklyExamplesBranch)
6178
git status
6279
6380
- task: PowerShell@2
@@ -68,6 +85,8 @@ jobs:
6885
pwsh: true
6986
targetType: inline
7087
script: |
88+
git status
89+
Start-Sleep 15s
7190
$Title = "[v1] Examples Update"
7291
$Body = "This pull request was automatically created by Azure Pipelines. Contains examples update."
7392
$BaseBranch = "dev"

openApiDocs/beta/Applications.yml

+19-9
Original file line numberDiff line numberDiff line change
@@ -2184,6 +2184,7 @@ paths:
21842184
tags:
21852185
- applications.synchronization
21862186
summary: Get synchronization from applications
2187+
description: Represents the capability for Azure Active Directory (Azure AD) identity synchronization through the Microsoft Graph API.
21872188
operationId: applications_GetSynchronization
21882189
parameters:
21892190
- name: application-id
@@ -2579,7 +2580,7 @@ paths:
25792580
description: 'Select a user and provision the account on-demand. The rate limit for this API is 5 requests per 10 seconds. '
25802581
externalDocs:
25812582
description: Find more info here
2582-
url: https://docs.microsoft.com/graph/api/synchronization-synchronizationjob-provision-on-demand?view=graph-rest-1.0
2583+
url: https://docs.microsoft.com/graph/api/synchronization-synchronizationjob-provisionondemand?view=graph-rest-1.0
25832584
operationId: applications.synchronization.jobs_provisionOnDemand
25842585
parameters:
25852586
- name: application-id
@@ -4929,11 +4930,7 @@ paths:
49294930
post:
49304931
tags:
49314932
- applications.tokenLifetimePolicy
4932-
summary: Assign tokenLifetimePolicy
4933-
description: Assign a tokenLifetimePolicy to an application or servicePrincipal.
4934-
externalDocs:
4935-
description: Find more info here
4936-
url: https://docs.microsoft.com/graph/api/application-post-tokenlifetimepolicies?view=graph-rest-1.0
4933+
summary: Create new navigation property ref to tokenLifetimePolicies for applications
49374934
operationId: applications_CreateTokenLifetimePoliciesGraphBPreRef
49384935
parameters:
49394936
- name: application-id
@@ -5195,6 +5192,10 @@ paths:
51955192
tags:
51965193
- applications.Actions
51975194
summary: Invoke action getUserOwnedObjects
5195+
description: 'Retrieve a list of recently deleted application and group objects owned by the specified user. This API returns up to 1,000 deleted objects owned by the user, sorted by ID, and doesn''t support pagination.'
5196+
externalDocs:
5197+
description: Find more info here
5198+
url: https://docs.microsoft.com/graph/api/directory-deleteditems-getuserownedobjects?view=graph-rest-1.0
51985199
operationId: applications_getUserOwnedObjects
51995200
requestBody:
52005201
description: Action parameters
@@ -13435,6 +13436,7 @@ paths:
1343513436
tags:
1343613437
- servicePrincipals.synchronization
1343713438
summary: Get synchronization from servicePrincipals
13439+
description: Represents the capability for Azure Active Directory (Azure AD) identity synchronization through the Microsoft Graph API.
1343813440
operationId: servicePrincipals_GetSynchronization
1343913441
parameters:
1344013442
- name: servicePrincipal-id
@@ -13830,7 +13832,7 @@ paths:
1383013832
description: 'Select a user and provision the account on-demand. The rate limit for this API is 5 requests per 10 seconds. '
1383113833
externalDocs:
1383213834
description: Find more info here
13833-
url: https://docs.microsoft.com/graph/api/synchronization-synchronizationjob-provision-on-demand?view=graph-rest-1.0
13835+
url: https://docs.microsoft.com/graph/api/synchronization-synchronizationjob-provisionondemand?view=graph-rest-1.0
1383413836
operationId: servicePrincipals.synchronization.jobs_provisionOnDemand
1383513837
parameters:
1383613838
- name: servicePrincipal-id
@@ -16490,6 +16492,10 @@ paths:
1649016492
tags:
1649116493
- servicePrincipals.Actions
1649216494
summary: Invoke action getUserOwnedObjects
16495+
description: 'Retrieve a list of recently deleted application and group objects owned by the specified user. This API returns up to 1,000 deleted objects owned by the user, sorted by ID, and doesn''t support pagination.'
16496+
externalDocs:
16497+
description: Find more info here
16498+
url: https://docs.microsoft.com/graph/api/directory-deleteditems-getuserownedobjects?view=graph-rest-1.0
1649316499
operationId: servicePrincipals_getUserOwnedObjects
1649416500
requestBody:
1649516501
description: Action parameters
@@ -17355,6 +17361,7 @@ components:
1735517361
description: Collection of objects supported by the directory.
1735617362
readOnly:
1735717363
type: boolean
17364+
description: Whether this object is read-only.
1735817365
version:
1735917366
type: string
1736017367
description: Read only value that indicates version discovered. null if discovery has not yet occurred.
@@ -20061,11 +20068,11 @@ components:
2006120068
properties:
2006220069
key:
2006320070
type: string
20064-
description: 'Contains the name of the field that a value is associated with. When a sign in or domain hint is included in the sign-in request, corresponding fields are included as key-value pairs. Possible keys: Login hint present, Domain hint present.'
20071+
description: Key.
2006520072
nullable: true
2006620073
value:
2006720074
type: string
20068-
description: Contains the corresponding value for the specified key. The value is true if a sign in hint was included in the sign-in request; otherwise false. The value is true if a domain hint was included in the sign-in request; otherwise false.
20075+
description: Value.
2006920076
nullable: true
2007020077
additionalProperties:
2007120078
type: object
@@ -20192,12 +20199,15 @@ components:
2019220199
properties:
2019320200
code:
2019420201
type: string
20202+
description: The error code.
2019520203
nullable: true
2019620204
message:
2019720205
type: string
20206+
description: The error message.
2019820207
nullable: true
2019920208
tenantActionable:
2020020209
type: boolean
20210+
description: The action to take to resolve the error.
2020120211
additionalProperties:
2020220212
type: object
2020320213
microsoft.graph.synchronizationTaskExecutionResult:

openApiDocs/beta/Bookings.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5138,11 +5138,11 @@ components:
51385138
properties:
51395139
displayName:
51405140
type: string
5141-
description: The display name of the identity. This property is read-only.
5141+
description: 'The display name of the identity. Note that this might not always be available or up to date. For example, if a user changes their display name, the API might show the new value in a future response, but the items associated with the user won''t show up as having changed when using delta.'
51425142
nullable: true
51435143
id:
51445144
type: string
5145-
description: The identifier of the identity. This property is read-only.
5145+
description: Unique identifier for the identity.
51465146
nullable: true
51475147
additionalProperties:
51485148
type: object

0 commit comments

Comments
 (0)