Skip to content

Commit fea6a7e

Browse files
committed
Merge branch 'main' into powershell-v3
2 parents 8ecc521 + ffb89f7 commit fea6a7e

86 files changed

Lines changed: 17863 additions & 4948 deletions

File tree

Some content is hidden

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

.azure-pipelines/docker-image-refresh.yml

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@
1515
name: $(Date:yyyyMMdd)$(Rev:.r)_docker-image-refresh
1616

1717
parameters:
18+
- name: WindowsPool
19+
type: string
20+
default: 1es-windows-ps-compute-m
1821
- name: LinuxPool
1922
type: string
2023
default: Azure-Pipelines-1ESPT-ExDShared
2124

2225
variables:
2326
REGISTRY: 'msgraphprodregistry.azurecr.io'
27+
REGISTRY_NAME: 'msgraphprodregistry' # ACR resource name (az acr build uses this, not the FQDN)
2428
IMAGE_NAME: 'public/microsoftgraph/powershell'
2529

2630
# Rebuild weekly so the image regularly picks up patched OS layers. `always: true` forces a run
@@ -47,10 +51,10 @@ resources:
4751
extends:
4852
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
4953
parameters:
50-
pool:
51-
name: ${{ parameters.LinuxPool }}
52-
image: ubuntu-latest
53-
os: linux
54+
# The 1ES template injects an SDL/compliance stage that MUST run on a Windows pool, so the
55+
# template-level pool is Windows. The actual container build overrides to a Linux pool at the
56+
# job level below. (Same pattern as sdk-release.yml.)
57+
pool: ${{ parameters.WindowsPool }}
5458
settings:
5559
networkIsolationPolicy: Permissive
5660
customBuildTags:
@@ -68,31 +72,22 @@ extends:
6872
steps:
6973
- checkout: self
7074

75+
# Build server-side with ACR Tasks: no local Docker daemon, no buildx/QEMU, and no
76+
# Docker Hub dependency (which the network-isolated 1ES pool can't reach). ACR pulls the
77+
# base image from MCR and pushes the result back to the registry.
7178
- task: AzureCLI@2
72-
displayName: 'Log in to Azure Container Registry'
79+
displayName: 'Build and push patched image (ACR Tasks)'
7380
inputs:
7481
azureSubscription: 'ACR Images Push Service Connection'
7582
scriptType: 'bash'
7683
scriptLocation: 'inlineScript'
7784
inlineScript: |
78-
az acr login --name $(REGISTRY)
79-
80-
- script: |
81-
docker run --privileged --rm tonistiigi/binfmt --install all
82-
displayName: 'Enable multi-platform builds'
83-
84-
- script: |
85-
docker buildx create --use --name refreshbuilder
86-
displayName: 'Set up Docker BuildX'
87-
88-
- bash: |
89-
set -euo pipefail
90-
formatted_date=$(date +"%Y%m%d%H%M%S")
91-
echo "Rebuilding $(REGISTRY)/$(IMAGE_NAME) on a patched base"
92-
docker buildx build \
93-
--platform linux/amd64 \
94-
--push \
95-
-t "$(REGISTRY)/$(IMAGE_NAME):latest" \
96-
-t "$(REGISTRY)/$(IMAGE_NAME):$formatted_date" \
97-
"$(Build.SourcesDirectory)"
98-
displayName: 'Build and push refreshed image'
85+
set -euo pipefail
86+
formatted_date=$(date +"%Y%m%d%H%M%S")
87+
echo "Rebuilding $(REGISTRY_NAME) / $(IMAGE_NAME) on a patched base via ACR Tasks"
88+
az acr build \
89+
--registry $(REGISTRY_NAME) \
90+
--image "$(IMAGE_NAME):latest" \
91+
--image "$(IMAGE_NAME):$formatted_date" \
92+
--platform linux/amd64 \
93+
"$(Build.SourcesDirectory)"

autorest.powershell

config/ModuleMetadata.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
"versions": {
2828
"authentication": {
2929
"prerelease": "",
30-
"version": "2.38.1"
30+
"version": "2.39.0"
3131
},
3232
"beta": {
3333
"prerelease": "",
34-
"version": "2.38.1"
34+
"version": "2.39.0"
3535
},
3636
"v1.0": {
3737
"prerelease": "",
38-
"version": "2.38.1"
38+
"version": "2.39.0"
3939
}
4040
}
4141
}

openApiDocs/beta/Applications.yml

Lines changed: 395 additions & 107 deletions
Large diffs are not rendered by default.

openApiDocs/beta/BackupRestore.yml

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12500,8 +12500,10 @@ components:
1250012500
$ref: '#/components/schemas/microsoft.graph.restorableArtifact'
1250112501
queryExpression:
1250212502
type: string
12503-
description: Specifies criteria to retrieve artifacts.
12503+
description: 'Deprecated. Going forward, use the structuredQueryExpression property instead. Specifies criteria to retrieve artifacts.'
1250412504
nullable: true
12505+
structuredQueryExpression:
12506+
$ref: '#/components/schemas/microsoft.graph.restoreSearchArtifactQueryExpression'
1250512507
additionalProperties:
1250612508
type: object
1250712509
microsoft.graph.restorePointSearchResponse:
@@ -13141,6 +13143,8 @@ components:
1314113143
nullable: true
1314213144
destinationType:
1314313145
$ref: '#/components/schemas/microsoft.graph.destinationType'
13146+
error:
13147+
$ref: '#/components/schemas/microsoft.graph.publicError'
1314413148
restoredItemKey:
1314513149
type: string
1314613150
description: The unique identifier for the restored artifact.
@@ -13346,6 +13350,39 @@ components:
1334613350
- message
1334713351
- unknownFutureValue
1334813352
type: string
13353+
microsoft.graph.restoreSearchArtifactQueryExpression:
13354+
title: restoreSearchArtifactQueryExpression
13355+
type: object
13356+
properties:
13357+
hasAttachment:
13358+
type: boolean
13359+
description: Indicates whether the artifact has an attachment. Optional.
13360+
nullable: true
13361+
items:
13362+
type: array
13363+
items:
13364+
$ref: '#/components/schemas/microsoft.graph.granularRestoreItems'
13365+
description: The types of items to include in the search. Optional.
13366+
recipients:
13367+
type: array
13368+
items:
13369+
type: string
13370+
nullable: true
13371+
description: The recipient email addresses to filter by. Optional.
13372+
senders:
13373+
type: array
13374+
items:
13375+
type: string
13376+
nullable: true
13377+
description: The sender email addresses to filter by. Optional.
13378+
subjects:
13379+
type: array
13380+
items:
13381+
type: string
13382+
nullable: true
13383+
description: The subject lines to filter by. Optional.
13384+
additionalProperties:
13385+
type: object
1334913386
microsoft.graph.restorePointSearchResult:
1335013387
title: restorePointSearchResult
1335113388
type: object
@@ -14099,6 +14136,16 @@ components:
1409914136
- completed
1410014137
- unknownFutureValue
1410114138
type: string
14139+
microsoft.graph.granularRestoreItems:
14140+
title: granularRestoreItems
14141+
enum:
14142+
- email
14143+
- note
14144+
- contact
14145+
- task
14146+
- calendar
14147+
- unknownFutureValue
14148+
type: string
1410214149
microsoft.graph.ODataErrors.MainError:
1410314150
required:
1410414151
- code

openApiDocs/beta/Bookings.yml

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13917,6 +13917,7 @@ components:
1391713917
nullable: true
1391813918
isRegistrationRequired:
1391913919
type: boolean
13920+
description: Indicates whether attendee registration is enabled for the virtual event.
1392013921
nullable: true
1392113922
settings:
1392213923
$ref: '#/components/schemas/microsoft.graph.virtualEventSettings'
@@ -15054,6 +15055,8 @@ components:
1505415055
type: string
1505515056
description: Specifies the spoken language used during the meeting for recording and transcription purposes.
1505615057
nullable: true
15058+
meetingType:
15059+
$ref: '#/components/schemas/microsoft.graph.onlineMeetingType'
1505715060
recordAutomatically:
1505815061
type: boolean
1505915062
description: Indicates whether to record the meeting automatically.
@@ -16586,58 +16589,58 @@ components:
1658616589
completeAfterDateTime:
1658716590
pattern: '^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$'
1658816591
type: string
16589-
description: DateTime after which the migration should be performed
16592+
description: 'Date and time after which the migration should be performed. The timestamp type represents date and time information using ISO 8601 format and is always in UTC. For example, midnight UTC on Jan 1, 2024, is 2024-01-01T00:00:00Z.'
1659016593
format: date-time
1659116594
createdBy:
1659216595
type: string
16593-
description: ID of the user that created the job
16596+
description: User principal name (UPN) of the user who created the job. Read-only.
1659416597
createdDateTime:
1659516598
pattern: '^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$'
1659616599
type: string
16597-
description: When the job what created
16600+
description: 'When the job was created. The timestamp type represents date and time information using ISO 8601 format and is always in UTC. For example, midnight UTC on Jan 1, 2024, is 2024-01-01T00:00:00Z. Read-only.'
1659816601
format: date-time
1659916602
displayName:
1660016603
type: string
16601-
description: Display name of the job. Must be unique per tenant
16604+
description: Display name of the job. Must be unique per tenant.
1660216605
exchangeSettings:
1660316606
$ref: '#/components/schemas/microsoft.graph.exchangeOnlineCrossTenantMigrationSettings'
1660416607
jobType:
1660516608
$ref: '#/components/schemas/microsoft.graph.crossTenantMigrationJobType'
1660616609
lastUpdatedDateTime:
1660716610
pattern: '^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$'
1660816611
type: string
16609-
description: When this migration job was last updated
16612+
description: 'When this migration job was last updated. The timestamp type represents date and time information using ISO 8601 format and is always in UTC. For example, midnight UTC on Jan 1, 2024, is 2024-01-01T00:00:00Z. Read-only.'
1661016613
format: date-time
1661116614
message:
1661216615
type: string
16613-
description: Status message of the migration job
16616+
description: Status message of the migration job. Nullable. Read-only.
1661416617
nullable: true
1661516618
resources:
1661616619
type: array
1661716620
items:
1661816621
type: string
16619-
description: IDs (GUID) of the resources being migrated with the migration job
16622+
description: IDs (GUID) of the resources that are migrated with the migration job.
1662016623
resourceType:
1662116624
type: string
16622-
description: Type of resource being migrated. Only Users is currently supported
16625+
description: Type of resource being migrated. Only Users is currently supported.
1662316626
sourceTenantId:
1662416627
type: string
16625-
description: ID (GUID) of the tenant that content is being migrated from
16628+
description: ID (GUID) of the tenant that content is migrated from.
1662616629
status:
1662716630
$ref: '#/components/schemas/microsoft.graph.crossTenantMigrationJobStatus'
1662816631
targetTenantId:
1662916632
type: string
16630-
description: ID of the tenant that content is being migrated to
16633+
description: ID of the tenant that content is migrated to. Read-only.
1663116634
workloads:
1663216635
type: array
1663316636
items:
1663416637
type: string
16635-
description: 'Workloads to migrate. Supported workloads are Teams, Exchange, and ODSP (OneDrive/SharePoint)'
16638+
description: 'Workloads to migrate. Supported workloads are Teams, Exchange, and ODSP (OneDrive/SharePoint).'
1663616639
users:
1663716640
type: array
1663816641
items:
1663916642
$ref: '#/components/schemas/microsoft.graph.crossTenantMigrationTask'
16640-
description: Details and status of the users being migrated in this migration job
16643+
description: Details and status of the users migrated in this migration job.
1664116644
x-ms-navigationProperty: true
1664216645
additionalProperties:
1664316646
type: object
@@ -16790,12 +16793,15 @@ components:
1679016793
properties:
1679116794
moreInfoWebUrl:
1679216795
type: string
16796+
description: Provides other video teleconferencing (VTC) dial-in options. Read-only.
1679316797
nullable: true
1679416798
tenantKey:
1679516799
type: string
16800+
description: The tenant key that is used to dial into the interactive voice response (IVR) of the partner CVI service.
1679616801
nullable: true
1679716802
videoTeleconferenceId:
1679816803
type: string
16804+
description: The video teleconferencing ID. Read-only.
1679916805
nullable: true
1680016806
additionalProperties:
1680116807
type: object
@@ -16829,6 +16835,16 @@ components:
1682916835
$ref: '#/components/schemas/microsoft.graph.lobbyBypassScope'
1683016836
additionalProperties:
1683116837
type: object
16838+
microsoft.graph.onlineMeetingType:
16839+
title: onlineMeetingType
16840+
enum:
16841+
- adhoc
16842+
- scheduled
16843+
- recurring
16844+
- broadcast
16845+
- meetnow
16846+
- unknownFutureValue
16847+
type: string
1683216848
microsoft.graph.onlineMeetingSensitivityLabelAssignment:
1683316849
title: onlineMeetingSensitivityLabelAssignment
1683416850
type: object
@@ -17990,6 +18006,8 @@ components:
1799018006
nullable: true
1799118007
destinationType:
1799218008
$ref: '#/components/schemas/microsoft.graph.destinationType'
18009+
error:
18010+
$ref: '#/components/schemas/microsoft.graph.publicError'
1799318011
restoredItemKey:
1799418012
type: string
1799518013
description: The unique identifier for the restored artifact.

openApiDocs/beta/Calendar.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21450,7 +21450,6 @@ components:
2145021450
description: 'A short, friendly name for the room, often used for easier identification or display in UI.'
2145121451
placeId:
2145221452
type: string
21453-
description: An alternative immutable unique identifier of the room. Read-only.
2145421453
nullable: true
2145521454
teamsEnabledState:
2145621455
$ref: '#/components/schemas/microsoft.graph.placeFeatureEnablement'
@@ -21525,7 +21524,6 @@ components:
2152521524
description: 'A short, friendly name for the workspace, often used for easier identification or display in the UI.'
2152621525
placeId:
2152721526
type: string
21528-
description: An alternative immutable unique identifier of the workspace. Read-only.
2152921527
nullable: true
2153021528
additionalProperties:
2153121529
type: object

openApiDocs/beta/ChangeNotifications.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,18 @@ components:
308308
resource:
309309
type: string
310310
description: Required. Specifies the resource that is monitored for changes. Don't include the base URL (https://graph.microsoft.com/beta/). See the possible resource path values for each supported resource.
311+
vapidPublicKey:
312+
type: string
313+
description: 'Optional. The application server''s VAPID public key, base64url-encoded (P-256 uncompressed point, 65 bytes pre-encoding). Obtained by calling the getVapidPublicKey function on the subscription collection. The browser passes this value to PushManager.subscribe({ applicationServerKey }) to bind the push subscription to this server identity. Required when notificationUrl targets a known Web Push service origin (for example, *.push.apple.com, fcm.googleapis.com, updates.push.services.mozilla.com); rejected with 400 Bad Request if supplied on a standard webhook subscription. For more information, see RFC 8292.'
314+
nullable: true
315+
webPushEncryptionP256dhPublicKey:
316+
type: string
317+
description: 'Optional. The subscriber''s ECDH public key, base64url-encoded (P-256 uncompressed point, 65 bytes pre-encoding). Obtained from the browser via PushSubscription.getKey(''p256dh''). Used as the peer public key during ECDH key agreement to derive the per-message content encryption key for RFC 8291 payload encryption. Required when notificationUrl targets a known Web Push service origin; rejected with 400 Bad Request if supplied on a standard webhook subscription. For more information, see RFC 8291 Section 3.'
318+
nullable: true
319+
webPushEncryptionSecret:
320+
type: string
321+
description: 'Optional. The subscriber''s auth secret, base64url-encoded (16 bytes pre-encoding). Obtained from the browser via PushSubscription.getKey(''auth''). Used as the HMAC-SHA-256 salt for the HKDF combine step that derives key material for RFC 8291 payload encryption. Write-only: this value is never returned in GET responses (returned as null). Treat as a secret. Required when notificationUrl targets a known Web Push service origin; rejected with 400 Bad Request if supplied on a standard webhook subscription. For more information, see RFC 8291 Section 3.'
322+
nullable: true
311323
additionalProperties:
312324
type: object
313325
microsoft.graph.entity:

0 commit comments

Comments
 (0)