Skip to content

Multiple changes to installers to publish in WinGet. #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Taron-art merged 12 commits into from
Jun 18, 2025
Merged

Multiple changes to installers to publish in WinGet. #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
99646cc
Update release.yml (#29)
Taron-art May 11, 2025
b9f83d9
Enabled dependabot (#30)
Taron-art May 11, 2025
db117a4
Update dependabot.yml
Taron-art May 11, 2025
bab5631
Update dependencies. (#32)
Taron-art May 12, 2025
350af22
Allow to set install folder from command line (InstallFolder="<Path>"…
Taron-art Jun 12, 2025
9f0f2f0
Updated copyrights for consistency. (#34)
Taron-art Jun 17, 2025
3831cc1
Update release.yml (#35)
Taron-art Jun 18, 2025
8cbbbb4
Update release.yml prerelease. (#36)
Taron-art Jun 18, 2025
3801203
Update release.yml
Taron-art Jun 18, 2025
68d56de
Update release.yml
Taron-art Jun 18, 2025
d2360a9
Update release.yml
Taron-art Jun 18, 2025
dfccad3
Update release.yml
Taron-art Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/Main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: .NET Core Desktop

on:
pull_request:
branches: [ "main" ]
branches: [ "main", "develop" ]

jobs:

Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

4 changes: 2 additions & 2 deletions src/PPM.Application.IntegrationTests/PPM.Application.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
<Page Remove="TestResults\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AwesomeAssertions" Version="8.1.0" />
<PackageReference Include="AwesomeAssertions" Version="8.2.0" />
<PackageReference Include="FakeItEasy" Version="8.3.0" />
<PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.3916" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit.Analyzers" Version="4.7.0">
Expand Down
12 changes: 6 additions & 6 deletions src/PPM.Application.Tests/PPM.Application.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
<Page Remove="TestResults\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AwesomeAssertions" Version="8.2.0" />
<PackageReference Include="FakeItEasy" Version="8.3.0" />
<PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="[7.0.0]" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.3916" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit.Analyzers" Version="4.7.0">
Expand Down Expand Up @@ -71,10 +71,10 @@
<!--We do not use WebView. It also produces build warnings.-->
<Target Name="RemoveUnnecessaryWebView2References" AfterTargets="ResolvePackageDependenciesForBuild">
<ItemGroup>
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Core'"/>
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.WinForms'"/>
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Wpf'"/>
<Reference Remove="@(ReferenceToBeRemoved)"/>
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Core'" />
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.WinForms'" />
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Wpf'" />
<Reference Remove="@(ReferenceToBeRemoved)" />
</ItemGroup>
</Target>
</Project>
11 changes: 6 additions & 5 deletions src/PPM.Application/PPM.Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<EnableMsixTooling>true</EnableMsixTooling>
<Nullable>enable</Nullable>
<TrimMode>partial</TrimMode>
<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
<SelfContained>true</SelfContained>
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
Expand Down Expand Up @@ -63,7 +64,7 @@
<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.3916" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
<PackageReference Include="ReswPlus" Version="0.3.1.5" Publish="false">
<TreatAsUsed>true</TreatAsUsed>
Expand Down Expand Up @@ -151,10 +152,10 @@
<!--We do not use WebView. It also produces build warnings.-->
<Target Name="RemoveUnnecessaryWebView2References" AfterTargets="ResolvePackageDependenciesForBuild">
<ItemGroup>
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Core'"/>
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.WinForms'"/>
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Wpf'"/>
<Reference Remove="@(ReferenceToBeRemoved)"/>
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Core'" />
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.WinForms'" />
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Wpf'" />
<Reference Remove="@(ReferenceToBeRemoved)" />
</ItemGroup>
</Target>
<Target Name="WindowsAppSdk_Issue_3843_Workaround_MsixContent" AfterTargets="AddMicrosoftWindowsAppSDKPayloadFiles">
Expand Down
2 changes: 1 addition & 1 deletion src/PPM.Installer/Package.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
<Package Name="Processes Priority Manager" Manufacturer="Processes Priority Manager Authors" Version="!(bind.FileVersion.MainExecutable)" UpgradeCode="9e97a052-3a55-4c2b-ae36-934275d1f976">
<Package Name="Processes Priority Manager" Manufacturer="Artur Kharin" Version="!(bind.FileVersion.MainExecutable)" UpgradeCode="9e97a052-3a55-4c2b-ae36-934275d1f976">
<Property Id="DISABLEADVTSHORTCUTS" Value="1" />
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
<ui:WixUI Id="WixUI_InstallDir" InstallDirectory="INSTALLFOLDER"/>
Expand Down
4 changes: 2 additions & 2 deletions src/PPM.InstallerBundle/Bundle.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
<Bundle Name="Processes Priority Manager" Manufacturer="Processes Priority Manager Authors" Version="!(bind.packageVersion.MainInstaller)"
<Bundle Name="Processes Priority Manager" Manufacturer="Artur Kharin" Version="!(bind.packageVersion.MainInstaller)"
UpgradeCode="a672eb32-98ef-4e21-890b-a5b56f85f724"
IconSourceFile="..\tune.ico" DisableModify="yes" AboutUrl="https://github.com/Taron-art/Processes-Priority-Manager">
<BootstrapperApplication>
<bal:WixStandardBootstrapperApplication Theme="rtfLicense" LicenseFile="License.rtf" LogoFile="tune.png" ShowVersion="yes"/>
<Payload Id="theme_uk_ua" Compressed="yes" Name="1058\thm.wxl" SourceFile="1058\RtfTheme.wxl"></Payload>
</BootstrapperApplication>
<Variable Name="InstallFolder" Type="formatted" Value="[ProgramFiles6432Folder][WixBundleName]"/>
<Variable Name="InstallFolder" Type="formatted" Value="[ProgramFiles6432Folder][WixBundleName]" bal:Overridable="yes"/>
<Chain>
<MsiPackage SourceFile="PPM.Installer.msi" Compressed="true" Id="MainInstaller" Cache="remove">
<MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]"/>
Expand Down
2 changes: 1 addition & 1 deletion src/SolutionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]

Expand Down
4 changes: 2 additions & 2 deletions src/pm_affinityservice/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]]
Expand Down
Loading