From eba5d9f46d3564ec8f8bf645ec41e4caacde1055 Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 15 Jul 2024 22:04:10 +0300 Subject: [PATCH 01/12] chore: bootstrap releases for path: . --- .release-please-manifest.json | 3 +++ release-please-config.json | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 .release-please-manifest.json create mode 100644 release-please-config.json diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 000000000..46b1b67c0 --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "0.0.0" +} \ No newline at end of file diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 000000000..41ecaacb0 --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,12 @@ +{ + "packages": { + ".": { + "changelog-path": "CHANGELOG.md", + "bump-minor-pre-major": false, + "bump-patch-for-minor-pre-major": false, + "draft": false, + "prerelease": false + } + }, + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json" +} \ No newline at end of file From 2bd3a7d455694fa4e6b1bccafbb57ea18bd93739 Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Mon, 15 Jul 2024 22:09:17 +0300 Subject: [PATCH 02/12] Added release-please yml files --- .github/release-please.yml | 3 +++ .github/workflows/release-please.yml | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 .github/release-please.yml create mode 100644 .github/workflows/release-please.yml diff --git a/.github/release-please.yml b/.github/release-please.yml new file mode 100644 index 000000000..e78f1ed91 --- /dev/null +++ b/.github/release-please.yml @@ -0,0 +1,3 @@ +manifest: true +primaryBranch: master +handleGHRelease: true \ No newline at end of file diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml new file mode 100644 index 000000000..102652480 --- /dev/null +++ b/.github/workflows/release-please.yml @@ -0,0 +1,23 @@ +on: + push: + branches: + - main + +permissions: + contents: write + pull-requests: write + +name: release-please + +jobs: + release-please: + runs-on: ubuntu-latest + steps: + - uses: googleapis/release-please-action@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + # optional. customize path to release-please-config.json + config-file: release-please-config.json + # optional. customize path to .release-please-manifest.json + manifest-file: .release-please-manifest.json + \ No newline at end of file From 6bdd66e0bcd6e2b6aba70319ba60533493e2067c Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Mon, 15 Jul 2024 22:11:29 +0300 Subject: [PATCH 03/12] Updated release version --- .release-please-manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 46b1b67c0..75e8a660b 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.0.0" + ".": "3.14.0" } \ No newline at end of file From f20cd288ba460202e6ece7062f47af34d8d35ec4 Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Mon, 15 Jul 2024 22:27:20 +0300 Subject: [PATCH 04/12] Updated release-please manifest config file --- release-please-config.json | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/release-please-config.json b/release-please-config.json index 41ecaacb0..d5541c41b 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -1,11 +1,21 @@ { + "exclude-paths": [ + ".git", + ".idea", + ".github", + ".vscode" + ], + "release-type": "dotnet", + "include-component-in-tag": false, + "include-v-in-tag": true, "packages": { ".": { + "package-name": "src/Microsoft.Graph.Core/", "changelog-path": "CHANGELOG.md", - "bump-minor-pre-major": false, - "bump-patch-for-minor-pre-major": false, - "draft": false, - "prerelease": false + "extra-files": [ + "src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj", + "README.md" + ] } }, "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json" From d90935029724f2c5e9c590361e13a189782ec258 Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Mon, 15 Jul 2024 22:37:31 +0300 Subject: [PATCH 05/12] Updated contributing with commit message format instructions --- CONTRIBUTING.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 623140576..b2d1dd1b4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,6 +15,36 @@ When a new package is about to be released, changes in dev will be merged into m Some things to note about this project: +## 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. + +``` +[optional scope]: + + + + +``` + +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. + ### How the library is built The .Net client library has a handwritten set of core files and two folders of generated models and request builders. These models and request builders are generated using the [MSGraph SDK Code Generator](https://github.com/microsoftgraph/MSGraph-SDK-Code-Generator). **Changes made to the ```Models``` and ```Requests``` folders will be overwritten** the next time the generator is run. From 55805607db9d6536bf7547a6e45700942a4cae12 Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Mon, 15 Jul 2024 22:57:41 +0300 Subject: [PATCH 06/12] Removed version bump script step --- .release-please-manifest.json | 2 +- pipelines/productionBuild.yml | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 75e8a660b..641036a18 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "3.14.0" + ".": "3.1.14" } \ No newline at end of file diff --git a/pipelines/productionBuild.yml b/pipelines/productionBuild.yml index 0b5bf9eb5..f050adda5 100644 --- a/pipelines/productionBuild.yml +++ b/pipelines/productionBuild.yml @@ -64,14 +64,6 @@ extends: script: | echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)" echo "##vso[task.setvariable variable=PATH]$(JAVA_HOME_11_X64)\bin;$(PATH)" - - task: PowerShell@2 - displayName: 'Validate updated version' - inputs: - targetType: filePath - filePath: 'scripts\ValidateUpdatedNugetVersion.ps1' - arguments: '-packageName "$(PACKAGE_NAME)" -projectPath "$(PROJECT_PATH)"' - pwsh: true - enabled: true - powershell: | dotnet workload install android macos ios maccatalyst displayName: 'Install needed dotnet workloads' From cfe466f15d7189080c2e1f0197a363090a581db1 Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Mon, 15 Jul 2024 23:32:47 +0300 Subject: [PATCH 07/12] Added sha for the last release PR --- release-please-config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/release-please-config.json b/release-please-config.json index d5541c41b..5dddb1f23 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -1,4 +1,5 @@ { + "bootstrap-sha": "9903e0c129683979234f287d59f7468ca5cd7341", "exclude-paths": [ ".git", ".idea", From 6c342f5446516aee1b48cb3dc1b8e18acd76a659 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 16 Jul 2024 11:49:55 +0300 Subject: [PATCH 08/12] Update release-please-config.json Co-authored-by: Andrew Omondi --- release-please-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-please-config.json b/release-please-config.json index 5dddb1f23..5930cbc1b 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -6,7 +6,7 @@ ".github", ".vscode" ], - "release-type": "dotnet", + "release-type": "dotnet-yoshi", "include-component-in-tag": false, "include-v-in-tag": true, "packages": { From ef36b25a19d26a2df069c75510de83cd53c6fd28 Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Tue, 16 Jul 2024 11:50:58 +0300 Subject: [PATCH 09/12] Reenabled validate update version step --- pipelines/productionBuild.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pipelines/productionBuild.yml b/pipelines/productionBuild.yml index f050adda5..0b5bf9eb5 100644 --- a/pipelines/productionBuild.yml +++ b/pipelines/productionBuild.yml @@ -64,6 +64,14 @@ extends: script: | echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)" echo "##vso[task.setvariable variable=PATH]$(JAVA_HOME_11_X64)\bin;$(PATH)" + - task: PowerShell@2 + displayName: 'Validate updated version' + inputs: + targetType: filePath + filePath: 'scripts\ValidateUpdatedNugetVersion.ps1' + arguments: '-packageName "$(PACKAGE_NAME)" -projectPath "$(PROJECT_PATH)"' + pwsh: true + enabled: true - powershell: | dotnet workload install android macos ios maccatalyst displayName: 'Install needed dotnet workloads' From f5feb2b260f99b1cdba164a36edf820a32376cd3 Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Wed, 17 Jul 2024 09:27:19 +0300 Subject: [PATCH 10/12] Deleted unnecessary workflow file --- .github/workflows/release-please.yml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 .github/workflows/release-please.yml diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml deleted file mode 100644 index 102652480..000000000 --- a/.github/workflows/release-please.yml +++ /dev/null @@ -1,23 +0,0 @@ -on: - push: - branches: - - main - -permissions: - contents: write - pull-requests: write - -name: release-please - -jobs: - release-please: - runs-on: ubuntu-latest - steps: - - uses: googleapis/release-please-action@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - # optional. customize path to release-please-config.json - config-file: release-please-config.json - # optional. customize path to .release-please-manifest.json - manifest-file: .release-please-manifest.json - \ No newline at end of file From 2f783d055d57527b2f6b99fe669c3ba18cce316f Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Wed, 17 Jul 2024 09:35:16 +0300 Subject: [PATCH 11/12] Added comments release-please comments on csproj file --- src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj index 0c0bcd2db..25ddaab7d 100644 --- a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj +++ b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj @@ -20,7 +20,12 @@ false 35MSSharedLib1024.snk true + 3.1.13 + + + + - https://github.com/microsoftgraph/msgraph-sdk-dotnet-core/blob/dev/CHANGELOG.md From c52dcb47ebcbbb2aaed092e9541e0d120f13166b Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Wed, 17 Jul 2024 15:09:31 +0300 Subject: [PATCH 12/12] Removed README.md entry because it lacks version info. --- release-please-config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/release-please-config.json b/release-please-config.json index 5930cbc1b..0ddbd1e55 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -14,8 +14,7 @@ "package-name": "src/Microsoft.Graph.Core/", "changelog-path": "CHANGELOG.md", "extra-files": [ - "src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj", - "README.md" + "src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj" ] } },