Merge pull request #129 from christianhelle/fix-build-version

Fix incorrect assembly and file version
christianhelle · Aug 25, 2023 · a074908 · a074908
2 parents 55ae9dd + 521a0d1
commit a074908
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
     - name: 🛒 Checkout repository
       uses: actions/checkout@v3        
     - name: 🛠️ Build
-      run: dotnet build src/Refitter.sln -c Release -p:UseSourceLink=true -p:PackageVersion="${{ env.VERSION }}"    
+      run: dotnet build -c Release src/Refitter.sln -p:UseSourceLink=true -p:PackageVersion="${{ env.VERSION }}" -p:Version="${{ env.VERSION }}"
     - name: 🧪 Test
       run: dotnet test src/Refitter.sln -c Release    
     - name: 🗳️ Upload

diff --git a/.github/workflows/release-template.yml b/.github/workflows/release-template.yml
@@ -22,12 +22,8 @@ jobs:
         uses: dotnet/nbgv@master
         with:
           setAllVars: true
-      - name: Update Version
-        run: ((Get-Content -Path Refitter.Core.csproj -Raw) -Replace "1.0.0", "${{ inputs.version }}") | Set-Content -Path Refitter.Core.csproj
-        working-directory: src/Refitter.Core/
-        shell: pwsh
       - name: Build
-        run: dotnet build -c Release src/Refitter.sln -p:UseSourceLink=true -p:PackageVersion="${{ inputs.version }}"
+        run: dotnet build -c Release src/Refitter.sln -p:UseSourceLink=true -p:PackageVersion="${{ inputs.version }}" -p:Version="${{ inputs.version }}"
       - name: Move packages
         shell: pwsh
         run: Get-ChildItem -Filter *.nupkg -Recurse | ForEach-Object { Move-Item -Path $_ -Destination . }

diff --git a/src/Refitter/GenerateCommand.cs b/src/Refitter/GenerateCommand.cs
@@ -45,6 +45,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, Settings se
         try
         {
             var stopwatch = Stopwatch.StartNew();
+            AnsiConsole.MarkupLine($"[green]Refitter v{GetType().Assembly.GetName().Version!}[/]");
             AnsiConsole.MarkupLine($"[green]Support key: {SupportInformation.GetSupportKey()}[/]");
 
             if (!string.IsNullOrWhiteSpace(settings.SettingsFilePath))