Update release workflow to build the reporter before packaging tools (#…

…4080)
icerpc · Sep 17, 2024 · 0c2706e · 0c2706e
1 parent 660a94b
commit 0c2706e
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 47 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,8 +4,8 @@ on:
   push:
     # Run on release and preview tags
     tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
-      - "v[0-9]+.[0-9]+.[0-9]+-preview[0-9]+"
+      - "v[0-9]+\\.[0-9]+\\.[0-9]+(\\.[0-9]+)?"
+      - "v[0-9]+\\.[0-9]+\\.[0-9]+(\\.[0-9]+)?-preview[0-9]+"
 
 jobs:
   build-compiler:
@@ -80,11 +80,16 @@ jobs:
           # Copy the compiler to the expected location to avoid rebuilding it when creating the NuGet packages
           New-Item -ItemType Directory -Path "$env:GITHUB_WORKSPACE\tools\slicec-cs\target\release"
           Copy-Item "slicec-cs-x86_64-pc-windows-msvc\slicec-cs.exe" -Destination "$env:GITHUB_WORKSPACE\tools\slicec-cs\target\release"
+      - name: Build IceRPC Tools
+        working-directory: tools
+        run: dotnet build --configuration Release
+        env:
+          SLICEC_CS_STAGING_PATH: ${{ github.workspace }}\tools\slicec-cs\staging
+      - name: Build IceRPC
+        run: dotnet build --configuration Release --output .
       - name: Pack IceRPC Tools
         working-directory: tools
-        run: |
-          dotnet build --configuration Release
-          dotnet pack --configuration Release --output ../
+        run: dotnet pack --configuration Release --output ../
         env:
           SLICEC_CS_STAGING_PATH: ${{ github.workspace }}\tools\slicec-cs\staging
       - name: Pack IceRPC

diff --git a/build/IceRpc.Examples.props b/build/IceRpc.Examples.props
@@ -5,7 +5,7 @@
       The version of the IceRPC NuGet packages used by the examples. It must be available from nuget.org once
       this branch is released.
     -->
-    <IceRpcVersion Condition="'$(IceRpcVersion)' == ''">0.4.*</IceRpcVersion>
+    <IceRpcVersion Condition="'$(IceRpcVersion)' == ''">0.4.0.1</IceRpcVersion>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AnalysisMode>All</AnalysisMode>

diff --git a/build/IceRpc.Version.props b/build/IceRpc.Version.props
@@ -1,7 +1,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!-- The version of all assembly files built in this repository -->
-    <Version Condition="'$(Version)' == ''">0.4.0</Version>
+    <Version Condition="'$(Version)' == ''">0.4.0.1</Version>
     <!-- The Protobuf version used by IceRpc.Protobuf -->
     <ProtobufVersion>28.1</ProtobufVersion>
     <NuGetProtobufVersion>3.$(ProtobufVersion)</NuGetProtobufVersion>

diff --git a/src/IceRpc.Templates/Templates/IceRpc-Protobuf-Client/IceRpc-Protobuf-Client.csproj b/src/IceRpc.Templates/Templates/IceRpc-Protobuf-Client/IceRpc-Protobuf-Client.csproj
@@ -12,12 +12,12 @@
     <!--#endif"-->
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="IceRpc.Protobuf.Tools" Version="0.4.*" PrivateAssets="All" />
-    <PackageReference Include="IceRpc.Protobuf" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Deadline" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Logger" Version="0.4.*" />
+    <PackageReference Include="IceRpc.Protobuf.Tools" Version="0.4.0.1" PrivateAssets="All" />
+    <PackageReference Include="IceRpc.Protobuf" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Deadline" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Logger" Version="0.4.0.1" />
     <!--#if (transport=="quic")-->
-    <PackageReference Include="IceRpc.Transports.Quic" Version="0.4.*" />
+    <PackageReference Include="IceRpc.Transports.Quic" Version="0.4.0.1" />
     <!--#endif"-->
     <!--#if (Framework=="net8.0")-->
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.*" />

diff --git a/src/IceRpc.Templates/Templates/IceRpc-Protobuf-DI-Client/IceRpc-Protobuf-DI-Client.csproj b/src/IceRpc.Templates/Templates/IceRpc-Protobuf-DI-Client/IceRpc-Protobuf-DI-Client.csproj
@@ -18,11 +18,11 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.*-preview.*" />
     <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.*-preview.*" />
     <!--#endif-->
-    <PackageReference Include="IceRpc.Protobuf.Tools" Version="0.4.*" PrivateAssets="All" />
-    <PackageReference Include="IceRpc.Protobuf" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Deadline" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Extensions.DependencyInjection" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Logger" Version="0.4.*" />
+    <PackageReference Include="IceRpc.Protobuf.Tools" Version="0.4.0.1" PrivateAssets="All" />
+    <PackageReference Include="IceRpc.Protobuf" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Deadline" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Extensions.DependencyInjection" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Logger" Version="0.4.0.1" />
     <!-- The 1.2 beta version is required for supporting the latest language features.
          See: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/pull/3187 -->
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">

diff --git a/src/IceRpc.Templates/Templates/IceRpc-Protobuf-DI-Server/IceRpc-Protobuf-DI-Server.csproj b/src/IceRpc.Templates/Templates/IceRpc-Protobuf-DI-Server/IceRpc-Protobuf-DI-Server.csproj
@@ -18,11 +18,11 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.*-preview.*" />
     <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.*-preview.*" />
     <!--#endif-->
-    <PackageReference Include="IceRpc.Protobuf.Tools" Version="0.4.*" PrivateAssets="All" />
-    <PackageReference Include="IceRpc.Protobuf" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Extensions.DependencyInjection" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Logger" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Deadline" Version="0.4.*" />
+    <PackageReference Include="IceRpc.Protobuf.Tools" Version="0.4.0.1" PrivateAssets="All" />
+    <PackageReference Include="IceRpc.Protobuf" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Extensions.DependencyInjection" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Logger" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Deadline" Version="0.4.0.1" />
     <!-- The 1.2 beta version is required for supporting the latest language features.
              See: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/pull/3187 -->
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">

diff --git a/src/IceRpc.Templates/Templates/IceRpc-Protobuf-Server/IceRpc-Protobuf-Server.csproj b/src/IceRpc.Templates/Templates/IceRpc-Protobuf-Server/IceRpc-Protobuf-Server.csproj
@@ -12,12 +12,12 @@
     <!--#endif"-->
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="IceRpc.Protobuf.Tools" Version="0.4.*" PrivateAssets="All" />
-    <PackageReference Include="IceRpc.Protobuf" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Deadline" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Logger" Version="0.4.*" />
+    <PackageReference Include="IceRpc.Protobuf.Tools" Version="0.4.0.1" PrivateAssets="All" />
+    <PackageReference Include="IceRpc.Protobuf" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Deadline" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Logger" Version="0.4.0.1" />
     <!--#if (transport=="quic")-->
-    <PackageReference Include="IceRpc.Transports.Quic" Version="0.4.*" />
+    <PackageReference Include="IceRpc.Transports.Quic" Version="0.4.0.1" />
     <!--#endif"-->
     <!--#if (Framework=="net8.0")-->
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.*" />

diff --git a/src/IceRpc.Templates/Templates/IceRpc-Slice-Client/IceRpc-Slice-Client.csproj b/src/IceRpc.Templates/Templates/IceRpc-Slice-Client/IceRpc-Slice-Client.csproj
@@ -12,12 +12,12 @@
     <!--#endif-->
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="IceRpc.Slice.Tools" Version="0.4.*" PrivateAssets="All" />
-    <PackageReference Include="IceRpc.Slice" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Deadline" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Logger" Version="0.4.*" />
+    <PackageReference Include="IceRpc.Slice.Tools" Version="0.4.0.1" PrivateAssets="All" />
+    <PackageReference Include="IceRpc.Slice" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Deadline" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Logger" Version="0.4.0.1" />
     <!--#if (transport=="quic") -->
-    <PackageReference Include="IceRpc.Transports.Quic" Version="0.4.*" />
+    <PackageReference Include="IceRpc.Transports.Quic" Version="0.4.0.1" />
     <!--#endif-->
     <!--#if (Framework=="net8.0")-->
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.*" />

diff --git a/src/IceRpc.Templates/Templates/IceRpc-Slice-DI-Client/IceRpc-Slice-DI-Client.csproj b/src/IceRpc.Templates/Templates/IceRpc-Slice-DI-Client/IceRpc-Slice-DI-Client.csproj
@@ -18,11 +18,11 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.*-preview.*" />
     <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.*-preview.*" />
     <!--#endif-->
-    <PackageReference Include="IceRpc.Slice.Tools" Version="0.4.*" PrivateAssets="All" />
-    <PackageReference Include="IceRpc.Slice" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Deadline" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Extensions.DependencyInjection" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Logger" Version="0.4.*" />
+    <PackageReference Include="IceRpc.Slice.Tools" Version="0.4.0.1" PrivateAssets="All" />
+    <PackageReference Include="IceRpc.Slice" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Deadline" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Extensions.DependencyInjection" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Logger" Version="0.4.0.1" />
     <!-- The 1.2 beta version is required for supporting the latest language features.
            See: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/pull/3187 -->
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">

diff --git a/src/IceRpc.Templates/Templates/IceRpc-Slice-DI-Server/IceRpc-Slice-DI-Server.csproj b/src/IceRpc.Templates/Templates/IceRpc-Slice-DI-Server/IceRpc-Slice-DI-Server.csproj
@@ -18,11 +18,11 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.*-preview.*" />
     <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.*-preview.*" />
     <!--#endif-->
-    <PackageReference Include="IceRpc.Slice.Tools" Version="0.4.*" PrivateAssets="All" />
-    <PackageReference Include="IceRpc.Slice" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Extensions.DependencyInjection" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Logger" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Deadline" Version="0.4.*" />
+    <PackageReference Include="IceRpc.Slice.Tools" Version="0.4.0.1" PrivateAssets="All" />
+    <PackageReference Include="IceRpc.Slice" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Extensions.DependencyInjection" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Logger" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Deadline" Version="0.4.0.1" />
     <!-- The 1.2 beta version is required for supporting the latest language features.
              See: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/pull/3187 -->
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">

diff --git a/src/IceRpc.Templates/Templates/IceRpc-Slice-Server/IceRpc-Slice-Server.csproj b/src/IceRpc.Templates/Templates/IceRpc-Slice-Server/IceRpc-Slice-Server.csproj
@@ -12,12 +12,12 @@
     <!--#endif"-->
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="IceRpc.Slice.Tools" Version="0.4.*" PrivateAssets="All" />
-    <PackageReference Include="IceRpc.Slice" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Deadline" Version="0.4.*" />
-    <PackageReference Include="IceRpc.Logger" Version="0.4.*" />
+    <PackageReference Include="IceRpc.Slice.Tools" Version="0.4.0.1" PrivateAssets="All" />
+    <PackageReference Include="IceRpc.Slice" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Deadline" Version="0.4.0.1" />
+    <PackageReference Include="IceRpc.Logger" Version="0.4.0.1" />
     <!--#if (transport=="quic")-->
-    <PackageReference Include="IceRpc.Transports.Quic" Version="0.4.*" />
+    <PackageReference Include="IceRpc.Transports.Quic" Version="0.4.0.1" />
     <!--#endif"-->
     <!--#if (Framework=="net8.0")-->
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.*" />

diff --git a/tests/IceRpc.Tests.Common/IceRpc.Tests.Common.csproj b/tests/IceRpc.Tests.Common/IceRpc.Tests.Common.csproj
@@ -5,6 +5,7 @@
     <Description>IceRPC test helper classes.</Description>
     <AssemblyTitle>$(Description)</AssemblyTitle>
     <PackageTags>icerpc;rpc</PackageTags>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>