Skip to content

Commit 3d484a7

Browse files
authored
Merge pull request #2593 from microsoftgraph/chore/update-release-please-config
Update Release Configuration.
2 parents 3c7d00e + f0edb10 commit 3d484a7

File tree

6 files changed

+10
-217
lines changed

6 files changed

+10
-217
lines changed

.azure-pipelines/ci-build.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,17 +261,15 @@ extends:
261261
nuGetFeedType: external
262262
publishFeedCredentials: 'microsoftgraph NuGet connection'
263263
- task: GitHubRelease@1
264-
displayName: 'GitHub release (create)'
264+
displayName: 'GitHub release (Upload Artifacts)'
265265
inputs:
266266
gitHubConnection: 'Kiota_Release'
267267
target: $(Build.SourceVersion)
268+
action: edit
268269
tagSource: userSpecifiedTag
269270
tag: 'v$(VERSION_STRING)'
270-
title: '$(VERSION_STRING)'
271-
releaseNotesSource: inline
271+
title: 'v$(VERSION_STRING)'
272272
assets: |
273273
!**/**
274274
$(Pipeline.Workspace)/Microsoft.Graph.*.*nupkg
275-
changeLogType: issueBased
276-
isPreRelease: '$(IS_PRE_RELEASE)'
277-
addChangeLog: true
275+
addChangeLog: false

.github/policies/msgraph-sdk-dotnet-branch-protection.yml

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -37,45 +37,9 @@ configuration:
3737
requiredStatusChecks:
3838
- build
3939
- license/cla
40-
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
40+
# Require branches to be up-to-date before merging. Requires requiredStatusChecks. boolean
4141
requiresStrictStatusChecks: true
4242
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
4343
restrictsPushes: false
4444
# Restrict who can dismiss pull request reviews. boolean
4545
restrictsReviewDismissals: false
46-
47-
- branchNamePattern: dev
48-
# This branch pattern applies to the following branches as of 06/12/2023 10:31:13:
49-
# dev
50-
51-
# Specifies whether this branch can be deleted. boolean
52-
allowsDeletions: false
53-
# Specifies whether forced pushes are allowed on this branch. boolean
54-
allowsForcePushes: false
55-
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
56-
dismissStaleReviews: true
57-
# Specifies whether admins can overwrite branch protection. boolean
58-
isAdminEnforced: false
59-
# Indicates whether "Require a pull request before merging" is enabled. boolean
60-
requiresPullRequestBeforeMerging: true
61-
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
62-
requiredApprovingReviewsCount: 1
63-
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
64-
requireCodeOwnersReview: true
65-
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
66-
requiresCommitSignatures: false
67-
# Are conversations required to be resolved before merging? boolean
68-
requiresConversationResolution: true
69-
# Are merge commits prohibited from being pushed to this branch. boolean
70-
requiresLinearHistory: false
71-
# 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
72-
requiredStatusChecks:
73-
- build
74-
- license/cla
75-
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
76-
requiresStrictStatusChecks: true
77-
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
78-
restrictsPushes: false
79-
# Restrict who can dismiss pull request reviews. boolean
80-
restrictsReviewDismissals: false
81-

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Thanks for considering making a contribution! Read over our guidelines and we wi
66
There are a few different recommended paths to get contributions into the released version of this library.
77

88
## File issues
9-
The best way to get started with a contribution is to start a dialog with us. Sometimes features will be under development or out of scope for this library and it's best to check before starting work on contribution, especially for large work items.
9+
The best way to get started with a contribution is to start a dialog with us. Sometimes features will be under development or out of scope for this library, and it's best to check before starting work on contribution, especially for large work items.
1010

1111
## Pull requests
12-
All pull requests should be submitted against the **dev** branch or a specific feature branch. The master branch is intended to represent the code released in the most-recent Nuget package.
12+
All pull requests should be submitted against the **master** branch or a specific feature branch. The master branch is intended to represent the code released in the most-recent Nuget package.
1313

1414
## Commit message format
1515

@@ -42,7 +42,7 @@ The recommended commit types used are:
4242

4343
Adding a footer with the prefix **BREAKING CHANGE:** will cause an increment of the _major_ version.
4444

45-
When a new package is about to be released, changes in dev will be merged into master. The package will be generated from master.
45+
When a new package is about to be release, the release PR will be merged into master. The package will be generated from master.
4646

4747
Some things to note about this project:
4848

release-please-config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
".github",
77
".vscode"
88
],
9-
"release-type": "dotnet",
9+
"release-type": "simple",
1010
"include-component-in-tag": false,
1111
"include-v-in-tag": true,
1212
"packages": {
@@ -15,7 +15,7 @@
1515
"changelog-path": "CHANGELOG.md",
1616
"extra-files": [
1717
"README.md",
18-
"src/Microsoft.Graph.csproj"
18+
"src/Microsoft.Graph/Microsoft.Graph.csproj"
1919
]
2020
}
2121
},

scripts/IncrementMinorVersion.ps1

Lines changed: 0 additions & 63 deletions
This file was deleted.

scripts/generateTypeSummary.ps1

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)