Merge pull request #18 from dolittle/3.2.0-upgradetools

Upgrade C# and TS generation tools
dolittle · Oct 19, 2021 · 385bb96 · 385bb96
2 parents 63ce7fa + f2090b7
commit 385bb96
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git 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:
@@ -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 }}

diff --git 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",

diff --git a/Source/MSBuild/Dolittle.Protobuf.MSBuild.targets b/Source/MSBuild/Dolittle.Protobuf.MSBuild.targets
@@ -5,8 +5,8 @@
         <Protobuf_NoWarnMissingExpected>true</Protobuf_NoWarnMissingExpected>
     </PropertyGroup>
 
-    <Import Project="$(NuGetPackageRoot)grpc.tools/2.35.0/build/Grpc.Tools.props"/>
-    <Import Project="$(NuGetPackageRoot)grpc.tools/2.35.0/build/Grpc.Tools.targets"/>
+    <Import Project="$(NuGetPackageRoot)grpc.tools/2.41.0/build/Grpc.Tools.props"/>
+    <Import Project="$(NuGetPackageRoot)grpc.tools/2.41.0/build/Grpc.Tools.targets"/>
 
     <ItemGroup>
         <Protobuf Include="$(DolittleProtoProject)/**/*.proto"

diff --git a/Source/MSBuild/Protobuf.MSBuild.csproj b/Source/MSBuild/Protobuf.MSBuild.csproj
@@ -21,10 +21,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.14.0" />
-    <PackageReference Include="Google.Protobuf.Tools" Version="3.14.0" />
-    <PackageReference Include="Grpc" Version="2.35.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.35.0" />
+    <PackageReference Include="Google.Protobuf" Version="3.18.1" />
+    <PackageReference Include="Google.Protobuf.Tools" Version="3.18.1" />
+    <PackageReference Include="Grpc" Version="2.41.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.41.0" />
   </ItemGroup>
 
 </Project>