Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .azure-pipelines/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ trigger:
branches:
include:
- main
- features/2.0
- dev
pr: none

jobs:
Expand Down Expand Up @@ -69,11 +69,11 @@ jobs:
publishLocation: "Container"

- task: NuGetCommand@2
displayName: Publish NuGet to preview feed
displayName: Publish NuGet to feed
inputs:
command: push
packagesToPush: $(Build.ArtifactStagingDirectory)/**/Microsoft.Graph.*.nupkg
publishVstsFeed: $(PROJECT_NAME)/$(PREVIEW_FEED_NAME)
publishVstsFeed: $(PROJECT_NAME)/$(FEED_NAME)
allowPackageConflicts: true

- template: ./common-templates/security-post-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ steps:
pwsh: true
targetType: inline
script: |
. "$(System.DefaultWorkingDirectory)\tools\Versions\BumpModuleVersion.ps1" -BumpV1Module -BumpBetaModule -BumpAuthModule -PreReleaseTag "rc" -Debug
. "$(System.DefaultWorkingDirectory)\tools\Versions\BumpModuleVersion.ps1" -BumpV1Module -BumpBetaModule -BumpAuthModule -Debug

- task: Bash@3
displayName: Commit downloaded files
Expand Down
6 changes: 3 additions & 3 deletions .azure-pipelines/weekly-examples-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ schedules:
displayName: 'PowerShellExamplesUpdateV2'
branches:
include:
- features/2.0
- dev
always: true
parameters:
- name: PipelineTimeout
Expand All @@ -25,7 +25,7 @@ resources:
type: github
endpoint: microsoftgraph
name: microsoftgraph/msgraph-sdk-powershell
ref: features/2.0
ref: dev

jobs:
- job: PowerShellExamplesUpdateV2
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:

- template: ./common-templates/create-pr.yml
parameters:
BaseBranch: "features/2.0"
BaseBranch: "dev"
TargetBranch: $(ComputeBranch.WeeklyExamplesBranch)
Title: "[v2] Examples Update"
Body: "This pull request was automatically created by Azure Pipelines. **Important** Check for unexpected deletions or changes in this PR."
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ parameters:
default: 1es-windows-ps-compute
- name: BaseBranch
displayName: Base Branch
default: features/2.0
default: dev
- name: GenerationBranch
displayName: Generation branch
default: v2/generation
Expand All @@ -35,7 +35,7 @@ parameters:
type: boolean

variables:
Branch: "WeeklyPreviewRefresh"
Branch: "WeeklyApiRefresh"
BaseBranch: ${{ parameters.BaseBranch }}
GenerationBranch: ${{ parameters.GenerationBranch }}
BuildAgent: ${{ parameters.BuildAgent }}
Expand All @@ -46,10 +46,10 @@ trigger: none
pr: none
schedules:
- cron: "0 12 * * TUE" # Run every Tuesday at noon UTC
displayName: "PS SDK Preview Weekly Refresh"
displayName: "PS SDK Weekly Refresh"
branches:
include:
- features/2.0
- dev
always: true
jobs:
- job: RefreshOpenAPIDocuments
Expand All @@ -73,6 +73,9 @@ jobs:
variables:
WeeklyBranch: $[ dependencies.RefreshOpenAPIDocuments.outputs['ComputeBranch.WeeklyBranch'] ]
steps:
- template: ./common-templates/checkout.yml
parameters:
TargetBranch: $(GenerationBranch) # Gives git local knowledge of the branch for merge.
- template: ./common-templates/checkout.yml
parameters:
TargetBranch: $(WeeklyBranch)
Expand Down Expand Up @@ -105,11 +108,11 @@ jobs:
ArtifactName: "drop"
publishLocation: "Container"
- task: NuGetCommand@2
displayName: Publish NuGet to preview feed
displayName: Publish NuGet to feed
inputs:
command: push
packagesToPush: $(Build.ArtifactStagingDirectory)/**/Microsoft.Graph.*.nupkg
publishVstsFeed: $(PROJECT_NAME)/$(PREVIEW_FEED_NAME)
publishVstsFeed: $(PROJECT_NAME)/$(FEED_NAME)
allowPackageConflicts: true
- template: ./generation-templates/generate-command-metadata.yml
- template: ./common-templates/security-post-checks.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @peombwa @ddyett @shemogumbe @timayabi2020
* @microsoftgraph/msgraph-powershell-team
108 changes: 108 additions & 0 deletions .github/policies/msgraph-sdk-powershell-branch-protection.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

# File initially created using https://github.com/MIchaelMainer/policyservicetoolkit/blob/main/branch_protection_export.ps1.

name: msgraph-sdk-powershell-branch-protection
description: Branch protection policy for the msgraph-sdk-powershell repository
resource: repository
configuration:
branchProtectionRules:

- branchNamePattern: main
# This branch pattern applies to the following branches as of 06/12/2023 10:31:18:
# main

# Specifies whether this branch can be deleted. boolean
allowsDeletions: false
# Specifies whether forced pushes are allowed on this branch. boolean
allowsForcePushes: false
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
dismissStaleReviews: false
# Specifies whether admins can overwrite branch protection. boolean
isAdminEnforced: false
# Indicates whether "Require a pull request before merging" is enabled. boolean
requiresPullRequestBeforeMerging: true
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
requiredApprovingReviewsCount: 1
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
requireCodeOwnersReview: false
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
requiresCommitSignatures: false
# Are conversations required to be resolved before merging? boolean
requiresConversationResolution: false
# Are merge commits prohibited from being pushed to this branch. boolean
requiresLinearHistory: false
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
requiresStrictStatusChecks: true
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
restrictsPushes: false
# Restrict who can dismiss pull request reviews. boolean
restrictsReviewDismissals: false

- branchNamePattern: dev
# This branch pattern applies to the following branches as of 06/12/2023 10:31:18:
# dev

# Specifies whether this branch can be deleted. boolean
allowsDeletions: false
# Specifies whether forced pushes are allowed on this branch. boolean
allowsForcePushes: false
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
dismissStaleReviews: true
# Specifies whether admins can overwrite branch protection. boolean
isAdminEnforced: false
# Indicates whether "Require a pull request before merging" is enabled. boolean
requiresPullRequestBeforeMerging: true
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
requiredApprovingReviewsCount: 1
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
requireCodeOwnersReview: true
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
requiresCommitSignatures: false
# Are conversations required to be resolved before merging? boolean
requiresConversationResolution: false
# Are merge commits prohibited from being pushed to this branch. boolean
requiresLinearHistory: false
# Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
requiredStatusChecks:
- license/cla
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
requiresStrictStatusChecks: true
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
restrictsPushes: false
# Restrict who can dismiss pull request reviews. boolean
restrictsReviewDismissals: false

- branchNamePattern: features/[0-9]*
# This branch pattern applies to the following branches as of 06/12/2023 10:31:18:
# features/2.0

# Specifies whether this branch can be deleted. boolean
allowsDeletions: false
# Specifies whether forced pushes are allowed on this branch. boolean
allowsForcePushes: false
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
dismissStaleReviews: true
# Specifies whether admins can overwrite branch protection. boolean
isAdminEnforced: false
# Indicates whether "Require a pull request before merging" is enabled. boolean
requiresPullRequestBeforeMerging: true
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
requiredApprovingReviewsCount: 1
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
requireCodeOwnersReview: false
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
requiresCommitSignatures: false
# Are conversations required to be resolved before merging? boolean
requiresConversationResolution: false
# Are merge commits prohibited from being pushed to this branch. boolean
requiresLinearHistory: false
# Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
requiredStatusChecks:
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
requiresStrictStatusChecks: true
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
restrictsPushes: false
# Restrict who can dismiss pull request reviews. boolean
restrictsReviewDismissals: false
2 changes: 1 addition & 1 deletion config/ModulesMapping.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"Devices.CloudPrint": "^print\\.",
"Devices.CorporateManagement": "^deviceAppManagement\\.|^officeConfiguration\\.|^users.mobileAppIntentAndState$|^users.mobileAppTroubleshootingEvent$|^users.windowsInformationProtectionDeviceRegistration$|^users.managedAppRegistration$|^users.managedDevice$|^users.deviceManagementTroubleshootingEvent$|^users.deviceEnrollmentConfiguration$",
"Devices.ServiceAnnouncement": "^admin.serviceAnnouncement$|^admin.Actions$|^admin.Functions$",
"DeviceManagement": "^deviceManagement.(deviceCompliancePolicy.*|deviceManagementConfigurationPolicy.*|deviceManagementCompliancePolicy.*|deviceManagementConfigurationSettingDefinition.*|deviceConfiguration.*|managedDevice.*|managementCondition.*|microsoftTunnel.*|userExperienceAnalytics.*|windowsInformationProtection.*|deviceManagement|deviceManagement(DerivedCredentialSettings|Intent|ResourceAccessProfileBase|Script|SettingCategory|SettingDefinition|Template|TroubleshootingEvent)|androidForWork(AppConfigurationSchema|Settings)|androidManagedStore(AccountEnterpriseSettings|AppConfigurationSchema)|deviceAndAppManagementAssignmentFilter|deviceCategory|advancedThreatProtectionOnboardingStateSummary|dataSharingConsent|detectedApp|deviceHealthScript|deviceShellScript|embeddedSIMActivationCodePool|groupPolicyConfiguration|macOSSoftwareUpdateAccountSummary|mobileAppTroubleshootingEvent|notificationMessageTemplate|remoteActionAudit|softwareUpdateStatusSummary|windowsMalwareInformation)$|^print.printer$|^print.printerShare$|^admin.edge$|^deviceManagement.monitoring$|^users.ListCloudPCs$",
"DeviceManagement": "^deviceManagement.(deviceCompliancePolicy.*|deviceManagementConfigurationPolicy.*|deviceManagementCompliancePolicy.*|deviceManagementConfigurationSettingDefinition.*|deviceConfiguration.*|managedDevice.*|managementCondition.*|microsoftTunnel.*|userExperienceAnalytics.*|windowsInformationProtection.*|deviceManagement|deviceManagement(DerivedCredentialSettings|Intent|ResourceAccessProfileBase|Script|SettingCategory|SettingDefinition|Template|TroubleshootingEvent)|androidForWork(AppConfigurationSchema|Settings)|androidManagedStore(AccountEnterpriseSettings|AppConfigurationSchema)|deviceAndAppManagementAssignmentFilter|deviceCategory|advancedThreatProtectionOnboardingStateSummary|dataSharingConsent|detectedApp|deviceHealthScript|deviceShellScript|embeddedSIMActivationCodePool|groupPolicyConfiguration|macOSSoftwareUpdateAccountSummary|mobileAppTroubleshootingEvent|notificationMessageTemplate|remoteActionAudit|softwareUpdateStatusSummary|windowsMalwareInformation)$|^admin.edge$|^deviceManagement.monitoring$|^users.ListCloudPCs$",
"DeviceManagement.Administration": "^deviceManagement.(virtualEndpoint.*|.*Partner.*|.*Certificate.*|.*role.*|deviceManagement(DomainJoinConnector|ExchangeConnector|ExchangeOnPremisesPolicy)|groupPolicy(Category|Definition|DefinitionFile|MigrationReport|ObjectFile|UploadedDefinitionFile)|auditEvent|cartToClassAssociation|comanagementEligibleDevice|deviceAndAppManagementRoleAssignment|intuneBrandingProfile|iosUpdateDeviceStatus|mobileThreatDefenseConnector|ndesConnector|resourceOperation|restrictedAppsViolation|termsAndConditions)",
"DeviceManagement.Enrollment": "^deviceManagement.(.*Enrollment.*|.*Autopilot.*|.*depOnboarding.*|importedDeviceIdentity|onPremisesConditionalAccessSettings|windowsFeatureUpdateProfile)$|^roleManagement.roleManagement$|^roleManagement.rbacApplicationMultiple$",
"DeviceManagement.Actions": "^deviceManagement.Actions$",
Expand Down
Loading