diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..b5c998d --- /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: "nuget" + directory: "/src/" # Location of package manifests + schedule: + interval: "weekly" + - package-ecosystem: "cargo" + directory: "/src/pm_affinityservice" + schedule: + interval: "weekly" 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..14f0e98 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,12 +45,21 @@ 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 + shell: bash + run: | + 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: false + prerelease: ${{ steps.source.outputs.branch == 'develop' && true || false }} generate_release_notes: true 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..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 @@ -63,7 +64,7 @@ - + true @@ -151,10 +152,10 @@ - - - - + + + + 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 ddec11e..46d4ee0 100644 --- a/src/PPM.InstallerBundle/Bundle.wxs +++ b/src/PPM.InstallerBundle/Bundle.wxs @@ -1,12 +1,12 @@  - - + 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]]