Merge pull request #2594 from microsoftgraph/dev

Latest dev changes before deleting dev

Author: SilasKenneth

.azure-pipelines/ci-build.yml

@@ -261,17 +261,15 @@ extends:
                     nuGetFeedType: external
                     publishFeedCredentials: 'microsoftgraph NuGet connection'
                 - task: GitHubRelease@1
-                  displayName: 'GitHub release (create)'
+                  displayName: 'GitHub release (Upload Artifacts)'
                   inputs:
                     gitHubConnection: 'Kiota_Release'
                     target: $(Build.SourceVersion)
+                    action: edit
                     tagSource: userSpecifiedTag
                     tag: 'v$(VERSION_STRING)'
-                    title: '$(VERSION_STRING)'
-                    releaseNotesSource: inline
+                    title: 'v$(VERSION_STRING)'
                     assets: |
                       !**/**
                       $(Pipeline.Workspace)/Microsoft.Graph.*.*nupkg
-                    changeLogType: issueBased
-                    isPreRelease: '$(IS_PRE_RELEASE)'
-                    addChangeLog: true
+                    addChangeLog: false

.github/dependabot.yml

@@ -1,10 +1,25 @@
 version: 2
 updates:
 - package-ecosystem: nuget
-  directory: "/"
+  directories:
+    - "**/*"
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  groups:
+    kiota-dependencies:
+      patterns:
+        - "*kiota*"
+    xunit:
+      patterns:
+        - xunit*
+    coverlet:
+      patterns:
+        - coverlet*
+    mstest:
+      patterns:
+        - Microsoft.NET.Test.Sdk
+        - Microsoft.TestPlatform.ObjectModel
 - package-ecosystem: github-actions
   directory: "/"
   schedule:

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

@@ -37,45 +37,9 @@ configuration:
     requiredStatusChecks:
     - build
     - license/cla
-    # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
+    # 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:13:
-    # 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: true
-    # 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:
-    - build
-    - 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
-

.github/policies/resourceManagement.yml

@@ -1,14 +1,14 @@
-id: 
+id:
 name: GitOps.PullRequestIssueManagement
 description: GitOps.PullRequestIssueManagement primitive
-owner: 
+owner:
 resource: repository
 disabled: false
-where: 
+where:
 configuration:
   resourceManagementConfiguration:
     scheduledSearches:
-    - description: 
+    - description:
       frequencies:
       - hourly:
           hour: 1
@@ -23,7 +23,7 @@ configuration:
           days: 3
       actions:
       - closeIssue
-    - description: 
+    - description:
       frequencies:
       - hourly:
           hour: 1
@@ -41,7 +41,7 @@ configuration:
           label: 'Status: No recent activity'
       - addReply:
           reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **4 days**. It will be closed if no further activity occurs **within 3 days of this comment**.
-    - description: 
+    - description:
       frequencies:
       - hourly:
           hour: 1
@@ -56,7 +56,7 @@ configuration:
       - addReply:
           reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
       - closeIssue
-    - description: 
+    - description:
       frequencies:
       - hourly:
           hour: 6
@@ -71,7 +71,7 @@ configuration:
           days: 7
       actions:
       - closeIssue
-    - description: 
+    - description:
       frequencies:
       - hourly:
           hour: 6
@@ -103,7 +103,7 @@ configuration:
           label: 'Needs: Attention :wave:'
       - removeLabel:
           label: 'status:waiting-for-author-feedback'
-      description: 
+      description:
     - if:
       - payloadType: Issues
       - not:
@@ -114,7 +114,7 @@ configuration:
       then:
       - removeLabel:
           label: 'Status: No recent activity'
-      description: 
+      description:
     - if:
       - payloadType: Issues
       - or:
@@ -124,22 +124,32 @@ configuration:
       then:
       - removeLabel:
           label: 'Needs: Triage'
-      description: 
+      description:
+    - if:
+      - payloadType: Issues
+      - isAction:
+          action: Closed
+      - hasLabel:
+          label: 'status:waiting-for-author-feedback'
+      then:
+      - removeLabel:
+          label: 'status:waiting-for-author-feedback'
+      description:
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Opened
       then:
       - addCodeFlowLink
-      description: 
+      description:
     - if:
       - payloadType: Issue_Comment
       - hasLabel:
           label: 'Status: No recent activity'
       then:
       - removeLabel:
           label: 'Status: No recent activity'
-      description: 
+      description:
     - if:
       - payloadType: Pull_Request_Review
       - isAction:
@@ -149,7 +159,7 @@ configuration:
       then:
       - addLabel:
           label: 'status:waiting-for-author-feedback'
-      description: 
+      description:
     - if:
       - payloadType: Pull_Request
       - isActivitySender:
@@ -162,7 +172,7 @@ configuration:
       then:
       - removeLabel:
           label: 'status:waiting-for-author-feedback'
-      description: 
+      description:
     - if:
       - payloadType: Issue_Comment
       - isActivitySender:
@@ -172,7 +182,7 @@ configuration:
       then:
       - removeLabel:
           label: 'status:waiting-for-author-feedback'
-      description: 
+      description:
     - if:
       - payloadType: Pull_Request_Review
       - isActivitySender:
@@ -182,7 +192,7 @@ configuration:
       then:
       - removeLabel:
           label: 'status:waiting-for-author-feedback'
-      description: 
+      description:
     - if:
       - payloadType: Pull_Request
       - not:
@@ -193,22 +203,22 @@ configuration:
       then:
       - removeLabel:
           label: 'Status: No recent activity'
-      description: 
+      description:
     - if:
       - payloadType: Issue_Comment
       - hasLabel:
           label: 'Status: No recent activity'
       then:
       - removeLabel:
           label: 'Status: No recent activity'
-      description: 
+      description:
     - if:
       - payloadType: Pull_Request_Review
       - hasLabel:
           label: 'Status: No recent activity'
       then:
       - removeLabel:
           label: 'Status: No recent activity'
-      description: 
-onFailure: 
-onSuccess: 
+      description:
+onFailure:
+onSuccess:

.github/release-please.yml

@@ -0,0 +1,3 @@
+manifest: true
+primaryBranch: master
+handleGHRelease: true

.github/workflows/auto-merge-dependabot.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.1.0
+        uses: dependabot/fetch-metadata@v2.2.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.github/workflows/project-auto-add.yml

@@ -18,10 +18,10 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
+        uses: actions/create-github-app-token@v1
         with:
-          app_id: ${{ secrets.GRAPHBOT_APP_ID }}
-          private_key: ${{ secrets.GRAPHBOT_APP_PEM }}
+          app-id: ${{ secrets.GRAPHBOT_APP_ID }}
+          private-key: ${{ secrets.GRAPHBOT_APP_PEM }}
 
       - name: Get project data
         env:

.github/workflows/validatePullRequest.yml

@@ -18,9 +18,9 @@ jobs:
     env:
       solutionName: Microsoft.Graph.sln
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4.0.0
+        uses: actions/setup-dotnet@v4.0.1
         with:
           dotnet-version: 6.0.x
       - name: Initialize CodeQL

.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+    ".": "5.56.0"
+}

CONTRIBUTING.md

@@ -6,12 +6,43 @@ Thanks for considering making a contribution! Read over our guidelines and we wi
 There are a few different recommended paths to get contributions into the released version of this library.
 
 ## File issues
-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.
+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.
 
 ## Pull requests
-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.
+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.
 
-When a new package is about to be released, changes in dev will be merged into master. The package will be generated from master.
+## Commit message format
+
+To support our automated release process, pull requests are required to follow the [Conventional Commit](https://www.conventionalcommits.org/en/v1.0.0/)
+format.
+
+Each commit message consists of a **header**, an optional **body** and an optional **footer**. The header is the first line of the commit and
+MUST have a **type** (see below for a list of types) and a **description**. An optional **scope** can be added to the header to give extra context.
+
+```
+<type>[optional scope]: <short description>
+<BLANK LINE>
+<optional body>
+<BLANK LINE>
+<optional footer(s)>
+```
+
+The recommended commit types used are:
+
+ - **feat** for feature updates (increments the _minor_ version)
+ - **fix** for bug fixes (increments the _patch_ version)
+ - **perf** for performance related changes e.g. optimizing an algorithm
+ - **refactor** for code refactoring changes
+ - **test** for test suite updates e.g. adding a test or fixing a test
+ - **style** for changes that don't affect the meaning of code. e.g. formatting changes
+ - **docs** for documentation updates e.g. ReadMe update or code documentation updates
+ - **build** for build system changes (gradle updates, external dependency updates)
+ - **ci** for CI configuration file changes e.g. updating a pipeline
+ - **chore** for miscallaneous non-sdk changesin the repo e.g. removing an unused file
+
+Adding a footer with the prefix **BREAKING CHANGE:** will cause an increment of the _major_ version.
+
+When a new package is about to be release, the release PR will be merged into master. The package will be generated from master.
 
 Some things to note about this project: