Skip to content

Conversation

@peombwa
Copy link
Member

@peombwa peombwa commented Jun 30, 2023

Resolves conflicts for #2117. Merge was done using ours strategy.

…gement\Identity.DirectoryManagement\examples\v1.0/New-MgDirectoryRoleScopedMember.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/New-MgDirectoryRoleTemplate.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/New-MgDomainServiceConfigurationRecord.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/New-MgDomainVerificationDnsRecord.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/New-MgOrganization.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/New-MgSubscribedSku.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Remove-MgContact.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Remove-MgContract.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Remove-MgDirectoryRole.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Remove-MgDirectoryRoleTemplate.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Remove-MgOrganization.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Remove-MgOrganizationBranding.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Remove-MgSubscribedSku.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Set-MgOrganizationBrandingBackgroundImage.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Set-MgOrganizationBrandingBannerLogo.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Set-MgOrganizationBrandingLocalizationBackgroundImage.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Set-MgOrganizationBrandingLocalizationBannerLogo.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Set-MgOrganizationBrandingLocalizationSquareLogo.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Set-MgOrganizationBrandingSquareLogo.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Update-MgContact.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Update-MgContract.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Update-MgDirectoryRole.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Update-MgDirectoryRoleTemplate.md-v1.0
…gement\Identity.DirectoryManagement\examples\v1.0/Update-MgSubscribedSku.md-v1.0
…\v1.0/Get-MgGroupAcceptedSenderByRef.md-v1.0
…\v1.0/Get-MgGroupConversationThreadPost.md-v1.0
…\v1.0/Get-MgGroupConversationThreadPostAttachment.md-v1.0
…\v1.0/Get-MgGroupConversationThreadPostInReplyToAttachment.md-v1.0
timayabi2020 and others added 24 commits May 22, 2023 22:45
…managerbyref-contains-examples-for-get-mgusermanager-and-get-mguser

Prevent importing of examples not related to a commandlet
…generator-script

[V1]Examples Generator Script Review
Use authorityUrl instead of tenantId when initializing MSAL
Capture current policy state so that we can make versioned changes to branch protection policies. This will enable policy history, auditing, review, standardization, and templatization. We will update policy in later PR.

We can ignore the rule that states: `At least one value under RequiredStatusChecks must be specified when RequiresStrictStatusChecks is true.` or `RequiresStrictStatusChecks must be true when specifying RequiredStatusChecks.` This is getting removed. This is getting removed.
* https://github.com/microsoft/GitOps.Branches/pull/73
* https://github.com/microsoft/GitOps.Branches/issues/72

This branch protection policy will not take effect until https://github.com/microsoftgraph/.github/blob/main/policies/branch-protection-sdks.yml has been removed.
Fixed non-working, autogenerated example and added a new one
@peombwa peombwa marked this pull request as ready for review June 30, 2023 16:43
@peombwa peombwa requested a review from timayabi2020 June 30, 2023 16:46
@peombwa peombwa self-assigned this Jun 30, 2023
@peombwa peombwa merged commit 4290b70 into features/2.0 Jun 30, 2023
@peombwa peombwa deleted the resolve-2.0-conflicts branch July 3, 2023 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants