From 99646cccf6732e9b7c65444d39d30710c5edfa3c Mon Sep 17 00:00:00 2001 From: Artur Kharin Date: Sun, 11 May 2025 13:34:11 +0300 Subject: [PATCH 01/12] Update release.yml (#29) * Update release.yml * Update Main.yml to run PR on develop --- .github/workflows/Main.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Main.yml b/.github/workflows/Main.yml index b119a26..3098753 100644 --- a/.github/workflows/Main.yml +++ b/.github/workflows/Main.yml @@ -2,7 +2,7 @@ name: .NET Core Desktop on: pull_request: - branches: [ "main" ] + branches: [ "main", "develop" ] jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c7f4043..727da0f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,6 +51,6 @@ jobs: with: files: src/Release/*Setup*.exe fail_on_unmatched_files: true - prerelease: false + prerelease: true generate_release_notes: true From b9f83d92502e870bba912e18d1040186001654c4 Mon Sep 17 00:00:00 2001 From: Artur Kharin Date: Sun, 11 May 2025 17:57:44 +0300 Subject: [PATCH 02/12] Enabled dependabot (#30) --- .github/dependabot.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..619293a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,15 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "dotnet-sdk" # See documentation for possible values + directory: "/src/" # Location of package manifests + schedule: + interval: "weekly" + - package-ecosystem: "cargo" # See documentation for possible values + directory: "/src/" # Location of package manifests + schedule: + interval: "weekly" From db117a4f14f16f9bc74adb38ebe84f0d8f77de28 Mon Sep 17 00:00:00 2001 From: Artur Kharin Date: Sun, 11 May 2025 18:26:19 +0300 Subject: [PATCH 03/12] Update dependabot.yml --- .github/dependabot.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 619293a..b5c998d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,11 +5,11 @@ version: 2 updates: - - package-ecosystem: "dotnet-sdk" # See documentation for possible values + - package-ecosystem: "nuget" directory: "/src/" # Location of package manifests schedule: interval: "weekly" - - package-ecosystem: "cargo" # See documentation for possible values - directory: "/src/" # Location of package manifests + - package-ecosystem: "cargo" + directory: "/src/pm_affinityservice" schedule: interval: "weekly" From bab5631d67c257df4e5c73c75ab378bd82278653 Mon Sep 17 00:00:00 2001 From: Artur Kharin Date: Mon, 12 May 2025 11:05:17 +0300 Subject: [PATCH 04/12] Update dependencies. (#32) --- .../PPM.Application.IntegrationTests.csproj | 4 ++-- .../PPM.Application.Tests.csproj | 12 ++++++------ src/PPM.Application/PPM.Application.csproj | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/PPM.Application.IntegrationTests/PPM.Application.IntegrationTests.csproj b/src/PPM.Application.IntegrationTests/PPM.Application.IntegrationTests.csproj index 6065953..275bc17 100644 --- a/src/PPM.Application.IntegrationTests/PPM.Application.IntegrationTests.csproj +++ b/src/PPM.Application.IntegrationTests/PPM.Application.IntegrationTests.csproj @@ -28,14 +28,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/PPM.Application.Tests/PPM.Application.Tests.csproj b/src/PPM.Application.Tests/PPM.Application.Tests.csproj index cf0bff8..98e4240 100644 --- a/src/PPM.Application.Tests/PPM.Application.Tests.csproj +++ b/src/PPM.Application.Tests/PPM.Application.Tests.csproj @@ -28,14 +28,14 @@ + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + @@ -71,10 +71,10 @@ - - - - + + + + \ No newline at end of file diff --git a/src/PPM.Application/PPM.Application.csproj b/src/PPM.Application/PPM.Application.csproj index a760bf6..2821065 100644 --- a/src/PPM.Application/PPM.Application.csproj +++ b/src/PPM.Application/PPM.Application.csproj @@ -63,7 +63,7 @@ - + true @@ -151,10 +151,10 @@ - - - - + + + + From 350af225383a0f4733b4c68ab9e5b1b3fedbbf5c Mon Sep 17 00:00:00 2001 From: Artur Kharin Date: Thu, 12 Jun 2025 17:58:20 +0300 Subject: [PATCH 05/12] Allow to set install folder from command line (InstallFolder="") (#33) --- src/PPM.InstallerBundle/Bundle.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PPM.InstallerBundle/Bundle.wxs b/src/PPM.InstallerBundle/Bundle.wxs index ddec11e..640e011 100644 --- a/src/PPM.InstallerBundle/Bundle.wxs +++ b/src/PPM.InstallerBundle/Bundle.wxs @@ -6,7 +6,7 @@ - + From 9f0f2f060c48072f3958d082bf84e02542be6815 Mon Sep 17 00:00:00 2001 From: Artur Kharin Date: Tue, 17 Jun 2025 15:07:06 +0300 Subject: [PATCH 06/12] Updated copyrights for consistency. (#34) * Updated copyrights for consistency. * Updatred cargo.toml encoding --- src/PPM.Application/PPM.Application.csproj | 1 + src/PPM.Installer/Package.wxs | 2 +- src/PPM.InstallerBundle/Bundle.wxs | 2 +- src/SolutionInfo.cs | 2 +- src/pm_affinityservice/Cargo.toml | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/PPM.Application/PPM.Application.csproj b/src/PPM.Application/PPM.Application.csproj index 2821065..3b1d121 100644 --- a/src/PPM.Application/PPM.Application.csproj +++ b/src/PPM.Application/PPM.Application.csproj @@ -13,6 +13,7 @@ true enable partial + true true true en diff --git a/src/PPM.Installer/Package.wxs b/src/PPM.Installer/Package.wxs index 7131ac0..f9bac65 100644 --- a/src/PPM.Installer/Package.wxs +++ b/src/PPM.Installer/Package.wxs @@ -1,5 +1,5 @@  - + diff --git a/src/PPM.InstallerBundle/Bundle.wxs b/src/PPM.InstallerBundle/Bundle.wxs index 640e011..46d4ee0 100644 --- a/src/PPM.InstallerBundle/Bundle.wxs +++ b/src/PPM.InstallerBundle/Bundle.wxs @@ -1,5 +1,5 @@  - diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index 71ec7e7..32c7991 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -5,7 +5,7 @@ [assembly: AssemblyFileVersion("0.0.0")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Processes Priority Manager")] -[assembly: AssemblyCopyright("Copyright © 2025")] +[assembly: AssemblyCopyright("Copyright Artur Kharin© 2025")] [assembly: AssemblyTrademark("")] [assembly: System.Runtime.Versioning.SupportedOSPlatform("windows10.0.17763")] diff --git a/src/pm_affinityservice/Cargo.toml b/src/pm_affinityservice/Cargo.toml index 7992774..1474505 100644 --- a/src/pm_affinityservice/Cargo.toml +++ b/src/pm_affinityservice/Cargo.toml @@ -1,10 +1,10 @@ -[package] +[package] name = "pm_affinityservice" version = "0.0.0" edition = "2021" [package.metadata.winres] -LegalCopyright = "Copyright 2025" +LegalCopyright = "Copyright ©Artur Kharin 2025" ProductName = "Processes Priority Manager" [[bin]] From 3831cc155dc758ed03da76049fd2d92d4ddf8aee Mon Sep 17 00:00:00 2001 From: Artur Kharin Date: Wed, 18 Jun 2025 12:34:59 +0300 Subject: [PATCH 07/12] Update release.yml (#35) --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 727da0f..385cca1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,6 +51,6 @@ jobs: with: files: src/Release/*Setup*.exe fail_on_unmatched_files: true - prerelease: true + prerelease: ${{ github.ref_name == 'develop' }} generate_release_notes: true From 8cbbbb461085022aea80ae0f3a878e5feb7076da Mon Sep 17 00:00:00 2001 From: Artur Kharin Date: Wed, 18 Jun 2025 12:52:23 +0300 Subject: [PATCH 08/12] Update release.yml prerelease. (#36) --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 385cca1..6ce3a81 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,6 +51,6 @@ jobs: with: files: src/Release/*Setup*.exe fail_on_unmatched_files: true - prerelease: ${{ github.ref_name == 'develop' }} + prerelease: ${{ github.ref_name == 'develop' && 'true' || 'false' }} generate_release_notes: true From 38012032c5a968b6743923304685beaea7f87ec1 Mon Sep 17 00:00:00 2001 From: Artur Kharin Date: Wed, 18 Jun 2025 13:02:54 +0300 Subject: [PATCH 09/12] Update release.yml One more attempt. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ce3a81..43fc2ce 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,6 +51,6 @@ jobs: with: files: src/Release/*Setup*.exe fail_on_unmatched_files: true - prerelease: ${{ github.ref_name == 'develop' && 'true' || 'false' }} + prerelease: ${{ github.ref_name == 'develop' && true || false }} generate_release_notes: true From 68d56de44d8df895aff823d6b4a0444b6c3e91a7 Mon Sep 17 00:00:00 2001 From: Artur Kharin Date: Wed, 18 Jun 2025 13:14:53 +0300 Subject: [PATCH 10/12] Update release.yml Another attempt with branch fetch. --- .github/workflows/release.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 43fc2ce..90a74be 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,12 +45,19 @@ jobs: # Build - name: Build the application run: dotnet build src\PPM.InstallerBundle\PPM.InstallerBundle.wixproj -c Release -p:Platform=x64 -o src\Release + + - name: Get source branch of tag + id: source + run: | + git fetch --prune --unshallow + branch=$(git branch -r --contains $GITHUB_SHA | grep -v '\->' | grep -v 'tags' | head -n 1 | sed 's#origin/##') + echo "source_branch=$branch" >> $GITHUB_OUTPUT - name: Release uses: softprops/action-gh-release@v2 with: files: src/Release/*Setup*.exe fail_on_unmatched_files: true - prerelease: ${{ github.ref_name == 'develop' && true || false }} + prerelease: ${{ steps.source.outputs.source_branch == 'develop' && true || false }} generate_release_notes: true From d2360a9241ca6527827b3e3c7ec1baf10040da8f Mon Sep 17 00:00:00 2001 From: Artur Kharin Date: Wed, 18 Jun 2025 13:29:56 +0300 Subject: [PATCH 11/12] Update release.yml Yet another attempt. --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 90a74be..8f3c2e8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,8 +48,9 @@ jobs: - name: Get source branch of tag id: source + shell: bash run: | - git fetch --prune --unshallow + git fetch --prune branch=$(git branch -r --contains $GITHUB_SHA | grep -v '\->' | grep -v 'tags' | head -n 1 | sed 's#origin/##') echo "source_branch=$branch" >> $GITHUB_OUTPUT From dfccad33194bb8b276ca415b8c95f0e1b191bcea Mon Sep 17 00:00:00 2001 From: Artur Kharin Date: Wed, 18 Jun 2025 13:47:36 +0300 Subject: [PATCH 12/12] Update release.yml Yet another attempt --- .github/workflows/release.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8f3c2e8..14f0e98 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,15 +50,16 @@ jobs: id: source shell: bash run: | - git fetch --prune - branch=$(git branch -r --contains $GITHUB_SHA | grep -v '\->' | grep -v 'tags' | head -n 1 | sed 's#origin/##') - echo "source_branch=$branch" >> $GITHUB_OUTPUT + raw=$(git branch -r --contains ${{ github.ref }}) + branch=${raw##*/} + echo "branch=$branch" >> $GITHUB_OUTPUT + echo "Branch is $branch." - name: Release uses: softprops/action-gh-release@v2 with: files: src/Release/*Setup*.exe fail_on_unmatched_files: true - prerelease: ${{ steps.source.outputs.source_branch == 'develop' && true || false }} + prerelease: ${{ steps.source.outputs.branch == 'develop' && true || false }} generate_release_notes: true