Skip to content

Commit b902335

Browse files
authored
Merge branch 'main' into fix-minor-update-check
2 parents 674a00a + 524e336 commit b902335

248 files changed

Lines changed: 13120 additions & 5691 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/dependabot.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
version: 2
22
updates:
33
- package-ecosystem: "github-actions"
4-
directory: "/src/"
4+
directory: "/"
55
schedule:
66
interval: "weekly"
7+
groups:
8+
actions-deps:
9+
patterns:
10+
- "*"
11+
- package-ecosystem: "nuget"
12+
directories:
13+
- "/src/*"
14+
schedule:
15+
interval: "weekly"
16+
groups:
17+
all-nuget-updates:
18+
patterns:
19+
- "*"

.github/workflows/dotnet-test.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,11 @@ jobs:
4141
working-directory: src
4242
run: dotnet restore
4343

44-
- name: Build
44+
- name: Test build
4545
working-directory: src
46-
run: dotnet build --configuration Release --no-restore
46+
run: dotnet build --configuration Release
4747

4848
- name: Run Tests
4949
working-directory: src
5050
run: dotnet test --no-restore --verbosity q --nologo
5151

52-
- name: Test publish
53-
working-directory: src
54-
run: dotnet publish --configuration Release --no-restore

.github/workflows/update-icons.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
exit 0
2525
2626
- name: Create Pull Request
27-
uses: peter-evans/create-pull-request@v6
27+
uses: peter-evans/create-pull-request@v7
2828
with:
2929
delete-branch: true
3030
base: main

.github/workflows/update-tolgee.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
python download_translations.py --autocommit
2222
2323
- name: Create Pull Request
24-
uses: peter-evans/create-pull-request@v6
24+
uses: peter-evans/create-pull-request@v7
2525
with:
2626
delete-branch: true
2727
base: main

.github/workflows/winget-prerelease.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Publish to WinGet
15-
uses: vedantmgoyal9/winget-releaser@a3ac67b0c3026bc335a33b722188e3ec769d6a64
15+
uses: vedantmgoyal9/winget-releaser@3e78d7ff0f525445bca5d6a989d31cdca383372e
1616
with:
1717
identifier: MartiCliment.UniGetUI.Pre-Release
1818
installers-regex: 'UniGetUI\.Installer\.exe$'

.github/workflows/winget-stable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
publish:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: vedantmgoyal9/winget-releaser@a3ac67b0c3026bc335a33b722188e3ec769d6a64
11+
- uses: vedantmgoyal9/winget-releaser@3e78d7ff0f525445bca5d6a989d31cdca383372e
1212
with:
1313
identifier: MartiCliment.UniGetUI
1414
installers-regex: 'UniGetUI\.Installer\.exe$'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,4 @@ InstallerExtras/MsiCreator/UniGetUISetup.msi
8585
src/global.json
8686
UniGetUI.Installer.ms-store-test.exe
8787
UniGetUI Installer_winget-fix-test.exe
88+
InstallerExtras/uninst-*.e32

README.md

Lines changed: 36 additions & 36 deletions
Large diffs are not rendered by default.

UniGetUI.iss

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; Script generated by the Inno Setup Script Wizard.
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

4-
#define MyAppVersion "3.1.8-beta1"
4+
#define MyAppVersion "3.2.0-beta2"
55
#define MyAppName "UniGetUI"
66
#define MyAppPublisher "Martí Climent"
77
#define MyAppURL "https://github.com/marticliment/UniGetUI"
@@ -23,7 +23,7 @@ AppPublisher={#MyAppPublisher}
2323
AppPublisherURL="https://www.marticliment.com/unigetui/"
2424
AppSupportURL={#MyAppURL}
2525
AppUpdatesURL={#MyAppURL}
26-
VersionInfoVersion=3.1.8.0
26+
VersionInfoVersion=3.2.0.0
2727
DefaultDirName="{autopf64}\UniGetUI"
2828
DisableProgramGroupPage=yes
2929
DisableDirPage=no
@@ -34,6 +34,11 @@ CloseApplications=no
3434
PrivilegesRequiredOverridesAllowed=dialog
3535
OutputBaseFilename=UniGetUI Installer
3636
OutputDir=.
37+
; Comment line below to disable digital signature of installer
38+
SignTool=azsign
39+
40+
SignedUninstaller=yes
41+
SignedUninstallerDir=InstallerExtras\
3742
MinVersion=10.0
3843
SetupIconFile=src\UniGetUI\Assets\Images\icon.ico
3944
UninstallDisplayIcon={app}\UniGetUI.exe
@@ -49,7 +54,7 @@ UsePreviousPrivileges=yes
4954
UsePreviousAppDir=yes
5055
ChangesEnvironment=yes
5156
RestartIfNeededByRun=no
52-
Uninstallable=IsTaskSelected('regularinstall')
57+
Uninstallable=WizardIsTaskSelected('regularinstall')
5358

5459

5560
[Languages]
@@ -240,5 +245,5 @@ Filename: "{app}\{#MyAppExeName}"; Parameters: "--migrate-wingetui-to-unigetui";
240245
[UninstallRun]
241246
; Remove WingetUI Notification registries
242247
; Filename: "{app}\{#MyAppExeName}"; Parameters: "--uninstall-unigetui"; Flags: skipifdoesntexist runhidden;
243-
Filename: {sys}\taskkill.exe; Parameters: "/f /im WingetUI.exe"; Flags: skipifdoesntexist runhidden;
244-
Filename: {sys}\taskkill.exe; Parameters: "/f /im UniGetUI.exe"; Flags: skipifdoesntexist runhidden;
248+
Filename: {sys}\taskkill.exe; Parameters: "/f /im WingetUI.exe"; Flags: skipifdoesntexist runhidden; RunOnceId: "KillWingetUI"
249+
Filename: {sys}\taskkill.exe; Parameters: "/f /im UniGetUI.exe"; Flags: skipifdoesntexist runhidden; RunOnceId: "KillUniGetUI"

WebBasedData/screenshot-database-v2.json

Lines changed: 43 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"package_count": {
3-
"total": 11803,
4-
"done": 5273,
5-
"packages_with_icon": 5273,
6-
"packages_with_screenshot": 626,
7-
"total_screenshots": 1961
3+
"total": 11805,
4+
"done": 5275,
5+
"packages_with_icon": 5275,
6+
"packages_with_screenshot": 633,
7+
"total_screenshots": 1977
88
},
99
"icons_and_screenshots": {
1010
"__test_entry_DO_NOT_EDIT_PLEASE": {
@@ -8242,8 +8242,13 @@
82428242
"images": []
82438243
},
82448244
"compactgui": {
8245-
"icon": "https://postimg.cc/23Nn3b75",
8246-
"images": []
8245+
"icon": "https://i.imgur.com/NHhZtxp.png",
8246+
"images": [
8247+
"https://i.imgur.com/VsswHJ2.png",
8248+
"https://i.imgur.com/9CcHxub.png",
8249+
"https://i.imgur.com/HavsEnA.png",
8250+
"https://i.imgur.com/a5epFFP.png"
8251+
]
82478252
},
82488253
"compactor": {
82498254
"icon": "https://community.chocolatey.org/content/packageimages/compactor.0.10.1.png",
@@ -20255,7 +20260,7 @@
2025520260
"images": []
2025620261
},
2025720262
"itunes": {
20258-
"icon": "https://www.apple.com/v/itunes/home/k/images/overview/itunes_logo__dwjkvx332d0m_large.png",
20263+
"icon": "https://zv915ylvcs.ufs.sh/f/fYIgEizARqiSf4d1j8PzARqiSTo3v8UBHIdlOwWsVeK71Y5Z",
2025920264
"images": []
2026020265
},
2026120266
"itunesfusion": {
@@ -21198,7 +21203,10 @@
2119821203
},
2119921204
"kawaii-player": {
2120021205
"icon": "",
21201-
"images": []
21206+
"images": [
21207+
"https://zv915ylvcs.ufs.sh/f/fYIgEizARqiSG47vnNlXuI0GKjDFqPw9kgdCraEfzZe1lLOt",
21208+
"https://zv915ylvcs.ufs.sh/f/fYIgEizARqiSFQrW9cVtiaGEPnZIjVfXlJQO9vd1k64UbFDe"
21209+
]
2120221210
},
2120321211
"kawanime": {
2120421212
"icon": "https://community.chocolatey.org/content/packageimages/kawanime.0.4.3.png",
@@ -26993,7 +27001,9 @@
2699327001
},
2699427002
"neofetch": {
2699527003
"icon": "",
26996-
"images": []
27004+
"images": [
27005+
"https://zv915ylvcs.ufs.sh/f/fYIgEizARqiSu7FpAit2c9F5IJV04zYrBXaySm7AGhM1vkEU"
27006+
]
2699727007
},
2699827008
"neoload": {
2699927009
"icon": "",
@@ -27217,7 +27227,9 @@
2721727227
},
2721827228
"netextender": {
2721927229
"icon": "https://postimg.cc/qtZcPS5b",
27220-
"images": []
27230+
"images": [
27231+
"https://postimg.cc/8sJsMDBD"
27232+
]
2722127233
},
2722227234
"netfoxdetective": {
2722327235
"icon": "",
@@ -36304,7 +36316,10 @@
3630436316
},
3630536317
"screentogif": {
3630636318
"icon": "https://community.chocolatey.org/content/packageimages/screentogif.2.41.0.png",
36307-
"images": []
36319+
"images": [
36320+
"https://www.screentogif.com/img/Startup.81fa6bd3.png",
36321+
"https://camo.githubusercontent.com/192d4a63fa660bdeaee93bf4d0832cd2d8b01c7edad9c0f625a652c464a6e4f8/68747470733a2f2f7777772e73637265656e746f6769662e636f6d2f6d656469612f5265636f726465722e706e67"
36322+
]
3630836323
},
3630936324
"screenview": {
3631036325
"icon": "",
@@ -49805,6 +49820,22 @@
4980549820
"orcaslicer": {
4980649821
"icon": "https://cdn.meowcat285.com/unigeticons/OrcaSlicer.png",
4980749822
"images": []
49823+
},
49824+
"sonicwall-netextender\n": {
49825+
"icon": "https://paulstsmith.github.io/images/netextender-icon.png",
49826+
"images": [
49827+
"https://paulstsmith.github.io/images/netextender-screenshot-connected.png",
49828+
"https://paulstsmith.github.io/images/netextender-screenShot-disconnected.png"
49829+
]
49830+
},
49831+
"ScooterSoftware-BeyondCompare-5": {
49832+
"icon": "https://www.scootersoftware.com/bc_icon.png",
49833+
"images": [
49834+
"https://www.scootersoftware.com/shot_FolderCompare_Dark.png",
49835+
"https://www.scootersoftware.com/shot_TextCompare_Dark.png",
49836+
"https://www.scootersoftware.com/shot_FolderMerge_Dark.png",
49837+
"https://www.scootersoftware.com/shot_TextMerge_Dark.png"
49838+
]
4980849839
}
4980949840
}
4981049841
}

0 commit comments

Comments
 (0)