Skip to content

Commit 4f24594

Browse files
Taron-artTaron-art
authored
Multiple changes to installers to publish in WinGet. (#37)
* Update release.yml (#29) * Update release.yml * Update Main.yml to run PR on develop * Enabled dependabot (#30) * Update dependabot.yml * Update dependencies. (#32) * Allow to set install folder from command line (InstallFolder="<Path>") (#33) * Updated copyrights for consistency. (#34) * Updated copyrights for consistency. * Updatred cargo.toml encoding * Update release.yml (#35) * Update release.yml prerelease. (#36)
1 parent 6a3c0d3 commit 4f24594

10 files changed

Lines changed: 46 additions & 21 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "nuget"
9+
directory: "/src/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"
12+
- package-ecosystem: "cargo"
13+
directory: "/src/pm_affinityservice"
14+
schedule:
15+
interval: "weekly"

‎.github/workflows/Main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: .NET Core Desktop
22

33
on:
44
pull_request:
5-
branches: [ "main" ]
5+
branches: [ "main", "develop" ]
66

77
jobs:
88

‎.github/workflows/release.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,21 @@ jobs:
4545
# Build
4646
- name: Build the application
4747
run: dotnet build src\PPM.InstallerBundle\PPM.InstallerBundle.wixproj -c Release -p:Platform=x64 -o src\Release
48+
49+
- name: Get source branch of tag
50+
id: source
51+
shell: bash
52+
run: |
53+
raw=$(git branch -r --contains ${{ github.ref }})
54+
branch=${raw##*/}
55+
echo "branch=$branch" >> $GITHUB_OUTPUT
56+
echo "Branch is $branch."
4857
4958
- name: Release
5059
uses: softprops/action-gh-release@v2
5160
with:
5261
files: src/Release/*Setup*.exe
5362
fail_on_unmatched_files: true
54-
prerelease: false
63+
prerelease: ${{ steps.source.outputs.branch == 'develop' && true || false }}
5564
generate_release_notes: true
5665

‎src/PPM.Application.IntegrationTests/PPM.Application.IntegrationTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
<Page Remove="TestResults\**" />
2929
</ItemGroup>
3030
<ItemGroup>
31-
<PackageReference Include="AwesomeAssertions" Version="8.1.0" />
31+
<PackageReference Include="AwesomeAssertions" Version="8.2.0" />
3232
<PackageReference Include="FakeItEasy" Version="8.3.0" />
3333
<PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1">
3434
<PrivateAssets>all</PrivateAssets>
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
</PackageReference>
3737
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
38-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
38+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.3916" />
3939
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
4040
<PackageReference Include="NUnit" Version="4.3.2" />
4141
<PackageReference Include="NUnit.Analyzers" Version="4.7.0">

‎src/PPM.Application.Tests/PPM.Application.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
<Page Remove="TestResults\**" />
2929
</ItemGroup>
3030
<ItemGroup>
31+
<PackageReference Include="AwesomeAssertions" Version="8.2.0" />
3132
<PackageReference Include="FakeItEasy" Version="8.3.0" />
3233
<PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1">
3334
<PrivateAssets>all</PrivateAssets>
3435
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3536
</PackageReference>
36-
<PackageReference Include="FluentAssertions" Version="[7.0.0]" />
3737
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
38-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
38+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.3916" />
3939
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
4040
<PackageReference Include="NUnit" Version="4.3.2" />
4141
<PackageReference Include="NUnit.Analyzers" Version="4.7.0">
@@ -71,10 +71,10 @@
7171
<!--We do not use WebView. It also produces build warnings.-->
7272
<Target Name="RemoveUnnecessaryWebView2References" AfterTargets="ResolvePackageDependenciesForBuild">
7373
<ItemGroup>
74-
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Core'"/>
75-
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.WinForms'"/>
76-
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Wpf'"/>
77-
<Reference Remove="@(ReferenceToBeRemoved)"/>
74+
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Core'" />
75+
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.WinForms'" />
76+
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Wpf'" />
77+
<Reference Remove="@(ReferenceToBeRemoved)" />
7878
</ItemGroup>
7979
</Target>
8080
</Project>

‎src/PPM.Application/PPM.Application.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<EnableMsixTooling>true</EnableMsixTooling>
1414
<Nullable>enable</Nullable>
1515
<TrimMode>partial</TrimMode>
16+
<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
1617
<SelfContained>true</SelfContained>
1718
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
1819
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
@@ -63,7 +64,7 @@
6364
<ItemGroup>
6465
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
6566
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
66-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
67+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.3916" />
6768
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
6869
<PackageReference Include="ReswPlus" Version="0.3.1.5" Publish="false">
6970
<TreatAsUsed>true</TreatAsUsed>
@@ -151,10 +152,10 @@
151152
<!--We do not use WebView. It also produces build warnings.-->
152153
<Target Name="RemoveUnnecessaryWebView2References" AfterTargets="ResolvePackageDependenciesForBuild">
153154
<ItemGroup>
154-
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Core'"/>
155-
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.WinForms'"/>
156-
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Wpf'"/>
157-
<Reference Remove="@(ReferenceToBeRemoved)"/>
155+
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Core'" />
156+
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.WinForms'" />
157+
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.FileName)' == 'Microsoft.Web.WebView2.Wpf'" />
158+
<Reference Remove="@(ReferenceToBeRemoved)" />
158159
</ItemGroup>
159160
</Target>
160161
<Target Name="WindowsAppSdk_Issue_3843_Workaround_MsixContent" AfterTargets="AddMicrosoftWindowsAppSDKPayloadFiles">

‎src/PPM.Installer/Package.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<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">
2-
<Package Name="Processes Priority Manager" Manufacturer="Processes Priority Manager Authors" Version="!(bind.FileVersion.MainExecutable)" UpgradeCode="9e97a052-3a55-4c2b-ae36-934275d1f976">
2+
<Package Name="Processes Priority Manager" Manufacturer="Artur Kharin" Version="!(bind.FileVersion.MainExecutable)" UpgradeCode="9e97a052-3a55-4c2b-ae36-934275d1f976">
33
<Property Id="DISABLEADVTSHORTCUTS" Value="1" />
44
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
55
<ui:WixUI Id="WixUI_InstallDir" InstallDirectory="INSTALLFOLDER"/>

‎src/PPM.InstallerBundle/Bundle.wxs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
2-
<Bundle Name="Processes Priority Manager" Manufacturer="Processes Priority Manager Authors" Version="!(bind.packageVersion.MainInstaller)"
2+
<Bundle Name="Processes Priority Manager" Manufacturer="Artur Kharin" Version="!(bind.packageVersion.MainInstaller)"
33
UpgradeCode="a672eb32-98ef-4e21-890b-a5b56f85f724"
44
IconSourceFile="..\tune.ico" DisableModify="yes" AboutUrl="https://github.com/Taron-art/Processes-Priority-Manager">
55
<BootstrapperApplication>
66
<bal:WixStandardBootstrapperApplication Theme="rtfLicense" LicenseFile="License.rtf" LogoFile="tune.png" ShowVersion="yes"/>
77
<Payload Id="theme_uk_ua" Compressed="yes" Name="1058\thm.wxl" SourceFile="1058\RtfTheme.wxl"></Payload>
88
</BootstrapperApplication>
9-
<Variable Name="InstallFolder" Type="formatted" Value="[ProgramFiles6432Folder][WixBundleName]"/>
9+
<Variable Name="InstallFolder" Type="formatted" Value="[ProgramFiles6432Folder][WixBundleName]" bal:Overridable="yes"/>
1010
<Chain>
1111
<MsiPackage SourceFile="PPM.Installer.msi" Compressed="true" Id="MainInstaller" Cache="remove">
1212
<MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]"/>

‎src/SolutionInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[assembly: AssemblyFileVersion("0.0.0")]
66
[assembly: AssemblyCompany("")]
77
[assembly: AssemblyProduct("Processes Priority Manager")]
8-
[assembly: AssemblyCopyright("Copyright © 2025")]
8+
[assembly: AssemblyCopyright("Copyright Artur Kharin© 2025")]
99
[assembly: AssemblyTrademark("")]
1010
[assembly: System.Runtime.Versioning.SupportedOSPlatform("windows10.0.17763")]
1111

‎src/pm_affinityservice/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
[package]
1+
[package]
22
name = "pm_affinityservice"
33
version = "0.0.0"
44
edition = "2021"
55

66
[package.metadata.winres]
7-
LegalCopyright = "Copyright 2025"
7+
LegalCopyright = "Copyright ©Artur Kharin 2025"
88
ProductName = "Processes Priority Manager"
99

1010
[[bin]]

0 commit comments

Comments
 (0)