x

dotnet · Jul 14, 2023 · 01e7f97 · 01e7f97
1 parent f48c041
commit 01e7f97
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,6 +19,7 @@ jobs:
     outputs:
       version: ${{ steps.version.outputs.version }}
       version3: ${{ steps.version.outputs.version3 }}
+      cliVersion: ${{ steps.cliVersion.outputs.version }}
     defaults:
       run:
         working-directory: src
@@ -40,6 +41,15 @@ jobs:
           echo "version=${version}" >> $GITHUB_OUTPUT
           echo "Resolved version3: $version3"
           echo "version3=${version3}" >> $GITHUB_OUTPUT
+      - name: Resolve CLI version
+        id: cliVersion
+        run: |
+          dotnet-gitversion /overrideconfig tag-prefix=cli-v > version.json
+          version="$(jq -r '.SemVer' version.json)"
+          pr_version="$(jq -r '.MajorMinorPatch' version.json)-$(jq -r '.PreReleaseLabel' version.json).${{ github.run_number }}.${{ github.run_attempt }}"
+          if [ "${{ github.event_name }}" = "pull_request" ]; then version=$pr_version; fi
+          echo "Resolved CLI version: $version"
+          echo "version=${version}" >> $GITHUB_OUTPUT
       - run: dotnet restore Roslynator.sln
       - run: dotnet build Roslynator.sln --no-restore
       - run: |
@@ -106,8 +116,7 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       RoslynatorDotNetCli: true
-      RoslynatorCliVersion: ${{ needs.common.outputs.version }}
-      RoslynatorCliPackageVersion: ${{ needs.common.outputs.version }}
+      RoslynatorCliVersion: ${{ needs.common.outputs.cliVersion }}
     defaults:
       run:
         working-directory: src/CommandLine
@@ -129,18 +138,16 @@ jobs:
     runs-on: windows-latest
     env:
       RoslynatorCommandLine: true
-      RoslynatorCliVersion: ${{ needs.common.outputs.version }}
-      RoslynatorCliPackageVersion: ${{ needs.common.outputs.version }}
+      RoslynatorCliVersion: ${{ needs.common.outputs.cliVersion }}
     defaults:
       run:
         working-directory: src/CommandLine
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - run: echo "Version=${{ needs.common.outputs.version }}" >> $GITHUB_ENV
       - run: dotnet restore
-      - run: dotnet build --no-restore
+      - run: dotnet build --no-restore /p:Version=${{ needs.common.outputs.version }}
       - run: dotnet publish --no-build
       - run: dotnet pack --no-build
       - uses: actions/upload-artifact@v3

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -8,11 +8,12 @@
     <Copyright>Copyright (c) 2016-2023 Josef Pihrt</Copyright>
     <EnableNETAnalyzers>false</EnableNETAnalyzers>
     <RoslynatorPublicKey>0024000004800000940000000602000000240000525341310004000001000100d348e1a51bc190259aed17cfe132736241fef462de45a5de6c881c7f9d705073c7a2a08ba5ae493c7e878fe5f3cf7909e89045cca696422f03b284b147daf6b93c47bc53dd61ceeae60f73149d183032f029761d0d59aab49a26be4f6af71cd8194ace937642bdcb515f07530096122e97cfe6c8549a843530f71c24c7e3dab8</RoslynatorPublicKey>
+    <RoslynCliVersion>4.6.0</RoslynCliVersion>
   </PropertyGroup>
 
   <PropertyGroup>
-    <RoslynatorCliVersion>0.6.0.0</RoslynatorCliVersion>
-    <RoslynatorCliPackageVersion>0.6.0</RoslynatorCliPackageVersion>
+
+    <RoslynatorCliPackageVersion>$(RoslynatorCliVersion)</RoslynatorCliPackageVersion>
 
     <RoslynatorPackageVersion>$(Version)</RoslynatorPackageVersion>
     <RoslynatorVersion>$(RoslynatorPackageVersion)</RoslynatorVersion>
@@ -28,8 +29,6 @@
     <RoslynatorCodeAnalysisAnalyzersPackageVersion>$(RoslynatorPackageVersion)</RoslynatorCodeAnalysisAnalyzersPackageVersion>
     <RoslynatorTestingPackageVersion>$(RoslynatorPackageVersion)</RoslynatorTestingPackageVersion>
 
-    <RoslynCliVersion>4.6.0</RoslynCliVersion>
-
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RoslynatorDotNetCli)' == true OR '$(RoslynatorCommandLine)' == true">