From 4b584859569e0f66d22f571ba0adb76b05d84813 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 22 Dec 2025 20:20:54 +0100 Subject: [PATCH] Fix version number and .net version --- .github/workflows/master.yml | 5 ++--- .github/workflows/nuget.yml | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 87f5cbeab..7e95751c4 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -22,9 +22,8 @@ jobs: run: | $MidnightUtc = [DateTime]::UtcNow.Date $BranchName = "${{ github.ref_name }}".replace('/','-').replace('.','-') - $ApiVersion = (Select-Xml -Path 'src/Artemis.Core/Artemis.Core.csproj' -XPath '//PluginApiVersion').Node.InnerText $NumberOfCommitsToday = (git log --after=$($MidnightUtc.ToString("o")) --oneline | Measure-Object -Line).Lines - $VersionNumber = "$ApiVersion.$($MidnightUtc.ToString("yyyy.MMdd")).$NumberOfCommitsToday" + $VersionNumber = "1.$($MidnightUtc.ToString("yyyy.MMdd")).$NumberOfCommitsToday" # If we're not in master, add the branch name to the version so it counts as prerelease if ($BranchName -ne "master") { $VersionNumber += "-$BranchName" } "version-number=$VersionNumber" >> $Env:GITHUB_OUTPUT @@ -55,7 +54,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' - name: Publish Artemis run: dotnet publish --configuration Release -p:Version=${{ needs.version.outputs.version-number }} --runtime ${{ matrix.rid }} --output build/${{ matrix.rid }} --self-contained Artemis/src/Artemis.UI.${{ matrix.csproj }}/Artemis.UI.${{ matrix.csproj }}.csproj - name: Upload Artifact diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml index 75e24ec9e..ddd1f62f8 100644 --- a/.github/workflows/nuget.yml +++ b/.github/workflows/nuget.yml @@ -22,9 +22,8 @@ jobs: run: | $MidnightUtc = [DateTime]::UtcNow.Date $BranchName = "${{ github.ref_name }}".replace('/','-').replace('.','-') - $ApiVersion = (Select-Xml -Path 'src/Artemis.Core/Artemis.Core.csproj' -XPath '//PluginApiVersion').Node.InnerText $NumberOfCommitsToday = (git log --after=$($MidnightUtc.ToString("o")) --oneline | Measure-Object -Line).Lines - $VersionNumber = "$ApiVersion.$($MidnightUtc.ToString("yyyy.MMdd")).$NumberOfCommitsToday" + $VersionNumber = "1.$($MidnightUtc.ToString("yyyy.MMdd")).$NumberOfCommitsToday" # If we're not in master, add the branch name to the version so it counts as prerelease if ($BranchName -ne "master") { $VersionNumber += "-$BranchName" } "version-number=$VersionNumber" >> $Env:GITHUB_OUTPUT @@ -37,7 +36,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' - name: Checkout uses: actions/checkout@v4 - name: Pack Artemis.Core