Updated build.yml and create_release.yml

syntax-tm · May 12, 2024 · ff60b18 · ff60b18
1 parent f1ee8b8
commit ff60b18
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,8 +3,7 @@ name: Build
 env:
   ARTIFACT: SAM
   PACKAGES: ${{ github.workspace }}\.nuget\packages
-  VERSION_PREFIX: 0.0.1
-  VERSION_SUFFIX: alpha
+  VERSION: 0.0.1-alpha
 
 on:
   workflow_call:
@@ -13,14 +12,9 @@ on:
         description: 'True if this build is for a release, false otherwise'
         default: false
         type: boolean
-      version-prefix:
-        description: 'The version prefix (e.g. "1.0.0")'
-        default: '0.0.1'
-        required: false
-        type: string
-      version-suffix:
-        description: 'The version suffix (e.g. "alpha")'
-        default: ''
+      version:
+        description: 'The semantic version number (e.g. "2.0.1-beta")'
+        default: '0.0.1-alpha'
         required: false
         type: string
   workflow_dispatch:
@@ -63,9 +57,9 @@ jobs:
         path: ${{ env.PACKAGES }}
         key: ${{ steps.cache-restore.outputs.cache-primary-key }}
     - name: Publish SAM
-      run: dotnet publish .\src\SAM\SAM.csproj -o publish -c Release -a x86 --no-restore /p:VersionPrefix=${{ inputs.version-prefix || env.VERSION_PREFIX }} /p:VersionSuffix=${{ inputs.version-suffix || env.VERSION_SUFFIX }}
+      run: dotnet publish .\src\SAM\SAM.csproj -o publish -c Release -a x86 --no-restore /p:Version=${{ inputs.version || env.VERSION }}
     - name: Publish SAM.Manager
-      run: dotnet publish .\src\SAM.Manager\SAM.Manager.csproj -o publish_manager -c Release -a x86 --no-restore /p:VersionPrefix=${{ inputs.version-prefix || env.VERSION_PREFIX }} /p:VersionSuffix=${{ inputs.version-suffix || env.VERSION_SUFFIX }}
+      run: dotnet publish .\src\SAM.Manager\SAM.Manager.csproj -o publish_manager -c Release -a x86 --no-restore /p:Version=${{ inputs.version || env.VERSION }}
     - name: Stage Artifacts
       run: |
         $samDir = Get-Item publish | Select-Object -ExpandProperty FullName
@@ -76,29 +70,32 @@ jobs:
         $stagedFiles = gci $samDir -Recurse -File | select -ExpandProperty FullName | Sort-Object
 
         Write-Host ""
-        Write-Host "`nStaged Artifacts:`n" -ForegroundColor Cyan
+        Write-Host "::group::Staged Artifacts"
 
         foreach ($stagedFile in $stagedFiles)
         {
           $relPath = [System.IO.Path]::GetRelativePath($samDir, $stagedFile)
           $ext = [System.IO.Path]::GetExtension($stagedFile)
 
+          $color = ''
+
           if ($ext -eq '.exe') {
-            Write-Host "- $relPath" -ForegroundColor Cyan
+            $color = $PSStyle.Foreground.BrightCyan
           }
           elseif ($ext -eq '.dll') {
-            Write-Host "- $relPath" -ForegroundColor Magenta
+            $color = $PSStyle.Foreground.BrightMagenta
           }
           elseif ($ext -eq '.pdb') {
-            Write-Host "- $relPath" -ForegroundColor Green
+            $color = $PSStyle.Foreground.BrightGreen
           }
-          elseif ($ext -eq '.json') {
-            Write-Host "- $relPath" -ForegroundColor Blue
-          }
-          else {
-            Write-Host "- $relPath"
+          elseif ($ext -eq '.json' -or $ext -eq '.config') {
+            $color = $PSStyle.Foreground.BrightBlue
           }
+
+          Write-Host "- $color$relPath$($PSStyle.Reset)"
         }
+
+        Write-Host "::endgroup::"
     - name: Upload a Build Artifact
       id: artifact-upload
       uses: actions/upload-artifact@v3

diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
@@ -19,6 +19,7 @@ jobs:
     permissions:
       contents: write
     outputs:
+      version: ${{ steps.validate-version.outputs.version }}
       version-prefix: ${{ steps.validate-version.outputs.version-prefix }}
       version-suffix: ${{ steps.validate-version.outputs.version-suffix }}
     steps:
@@ -51,15 +52,15 @@ jobs:
 
         Write-Host ""
 
+        echo "version=version" >> $env:GITHUB_OUTPUT
         echo "version-prefix=$prefix" >> $env:GITHUB_OUTPUT
         echo "version-suffix=$suffix" >> $env:GITHUB_OUTPUT
   build:
     uses: syntax-tm/SteamAchievementManager/.github/workflows/build.yml@main
     needs: setup
     with:
       is_release: true
-      version-prefix: ${{ needs.setup.outputs.version-prefix }}
-      version-suffix: ${{ needs.setup.outputs.version-suffix }}
+      version: ${{ needs.setup.outputs.version }}
   create-release:
     runs-on: windows-latest
     needs: [build]

diff --git a/src/SAM.API/SAM.API.csproj b/src/SAM.API/SAM.API.csproj
@@ -13,6 +13,7 @@
     <PackageTags>sam;steam;steamworks;games;achievement;manager;valve;api;stats;</PackageTags>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/src/SAM.Core/SAM.Core.csproj b/src/SAM.Core/SAM.Core.csproj
@@ -7,6 +7,7 @@
     <UseWPF>true</UseWPF>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/src/SAM.Manager/SAM.Manager.csproj b/src/SAM.Manager/SAM.Manager.csproj
@@ -14,6 +14,7 @@
     <!--<PublishTrimmed>true</PublishTrimmed>
     <TrimMode>full</TrimMode>
     <_SuppressWpfTrimError>true</_SuppressWpfTrimError>-->
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
@@ -94,7 +95,8 @@
     </None>
   </ItemGroup>
 
-  <Target Name="AddRuntimeDependenciesToContent" Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $(Configuration) == 'Debug' " BeforeTargets="GetCopyToOutputDirectoryItems" DependsOnTargets="GenerateBuildDependencyFile;GenerateBuildRuntimeConfigurationFiles">
+  <!-- this does not run on publish. this copies this project's output to the main (SAM) project's output folder when on build -->
+  <Target Name="AddRuntimeDependenciesToContent" Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $(_IsPublishing) == '' " BeforeTargets="GetCopyToOutputDirectoryItems" DependsOnTargets="GenerateBuildDependencyFile;GenerateBuildRuntimeConfigurationFiles">
     <ItemGroup>
       <ContentWithTargetPath Include="$(ProjectDepsFilePath)" CopyToOutputDirectory="PreserveNewest" TargetPath="$(ProjectDepsFileName)" />
       <ContentWithTargetPath Include="$(ProjectRuntimeConfigFilePath)" CopyToOutputDirectory="PreserveNewest" TargetPath="$(ProjectRuntimeConfigFileName)" />

diff --git a/src/SAM/SAM.csproj b/src/SAM/SAM.csproj
@@ -14,6 +14,7 @@
     <!--<PublishTrimmed>true</PublishTrimmed>
     <TrimMode>full</TrimMode>
     <_SuppressWpfTrimError>true</_SuppressWpfTrimError>-->
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>