From 61085ed8589da7cc51c38dd98a5a6c29489a0fb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20H=C3=B8genes?=
<1014990+jakhog@users.noreply.github.com>
Date: Tue, 19 Oct 2021 10:03:29 +0200
Subject: [PATCH 1/6] Add prerelase for upgrading tools
---
.github/workflows/workflow.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 59777ac..05a5cca 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -1,7 +1,7 @@
name: CI/CD Workflow
env:
- PRERELEASE_BRANCHES: alpha,beta # Comma separated list of prerelease branch names. 'alpha,rc, ...'
+ PRERELEASE_BRANCHES: upgradetools # Comma separated list of prerelease branch names. 'alpha,rc, ...'
NUGET_OUTPUT: Artifacts/NuGet
on:
From 99a62a0399b5ee9e9cc98c6a6f8154b663aec7a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20H=C3=B8genes?=
<1014990+jakhog@users.noreply.github.com>
Date: Tue, 19 Oct 2021 10:00:07 +0200
Subject: [PATCH 2/6] Upgrade C# tools
---
Source/MSBuild/Dolittle.Protobuf.MSBuild.targets | 4 ++--
Source/MSBuild/Protobuf.MSBuild.csproj | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Source/MSBuild/Dolittle.Protobuf.MSBuild.targets b/Source/MSBuild/Dolittle.Protobuf.MSBuild.targets
index d065e0e..a681b15 100644
--- a/Source/MSBuild/Dolittle.Protobuf.MSBuild.targets
+++ b/Source/MSBuild/Dolittle.Protobuf.MSBuild.targets
@@ -5,8 +5,8 @@
true
-
-
+
+
-
-
-
-
+
+
+
+
From 85ff13178935979997ca99e9ebeac7baedeb8b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20H=C3=B8genes?=
<1014990+jakhog@users.noreply.github.com>
Date: Tue, 19 Oct 2021 10:01:59 +0200
Subject: [PATCH 3/6] Upgrade TS tools
---
Source/JavaScript/package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/JavaScript/package.json b/Source/JavaScript/package.json
index 5fd4623..3127708 100644
--- a/Source/JavaScript/package.json
+++ b/Source/JavaScript/package.json
@@ -24,8 +24,8 @@
"dependencies": {
"commander": "7.2.0",
"execa": "5.0.0",
- "grpc-tools": "1.11.1",
- "grpc_tools_node_protoc_ts": "5.1.3"
+ "grpc-tools": "1.11.2",
+ "grpc_tools_node_protoc_ts": "5.3.2"
},
"devDependencies": {
"@tsconfig/node12": "1.0.7",
From 8127ef581a05569287d59f59f205c6938b8ac366 Mon Sep 17 00:00:00 2001
From: dolittle-build
Date: Tue, 19 Oct 2021 08:06:22 +0000
Subject: [PATCH 4/6] "Add version 3.2.0-upgradetools.0 to changelog"
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 284561f..505f6db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# [3.2.0-upgradetools.0] - 2021-10-19 [PR: #19](https://github.com/dolittle/Protobuf/pull/19)
+Update versions of C# and TS dependencies
+
+
# [3.1.3] - 2021-3-27 [PR: #17](https://github.com/dolittle/Protobuf/pull/17)
## Summary
From f787622689edae9edc1504f86a44fc92addb1fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20H=C3=B8genes?=
<1014990+jakhog@users.noreply.github.com>
Date: Tue, 19 Oct 2021 10:08:33 +0200
Subject: [PATCH 5/6] Dont add to changelog on prereleases
---
.github/workflows/workflow.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 05a5cca..6de9252 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -74,6 +74,7 @@ jobs:
version: ${{ needs.context.outputs.version }}
release-type: ${{ needs.context.outputs.release-type }}
- name: Prepend to Changelog
+ if: ${{ needs.context.outputs.should-publish == 'true' && needs.context.outputs.release-type != 'prerelease' }}
uses: dolittle/add-to-changelog-action@v2
with:
version: ${{ steps.increment-version.outputs.next-version }}
From 87a088eac9b089b4ca39c6f40d3142a998725724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20H=C3=B8genes?=
<1014990+jakhog@users.noreply.github.com>
Date: Tue, 19 Oct 2021 10:09:00 +0200
Subject: [PATCH 6/6] Remove prerelease changelog entry
---
CHANGELOG.md | 4 ----
1 file changed, 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 505f6db..284561f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,3 @@
-# [3.2.0-upgradetools.0] - 2021-10-19 [PR: #19](https://github.com/dolittle/Protobuf/pull/19)
-Update versions of C# and TS dependencies
-
-
# [3.1.3] - 2021-3-27 [PR: #17](https://github.com/dolittle/Protobuf/pull/17)
## Summary