diff --git a/VERSION b/VERSION index e8f41f06..ed35d092 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.8 \ No newline at end of file +2.0.9 \ No newline at end of file diff --git a/scoop/wtq-2.0.8.json b/scoop/wtq-2.0.8.json new file mode 100644 index 00000000..0501bf11 --- /dev/null +++ b/scoop/wtq-2.0.8.json @@ -0,0 +1,20 @@ +{ + "version": "2.0.8", + "description": "Turn any app into a Quake-style toggleable app.", + "homepage": "https://github.com/flyingpie/windows-terminal-quake", + "bin": "wtq.exe", + "shortcuts": [ + [ + "wtq.exe", + "WTQ - Windows Terminal Quake" + ] + ], + "persist": "wtq.jsonc", + "checkver": "github", + "architecture": { + "64bit": { + "url": "https://github.com/flyingpie/windows-terminal-quake/releases/download/v2.0.8/win-x64_self-contained.zip", + "hash": "2fd44326aca5a34f7dcc84e2b37ba79c3395c4c301b5e38523020636fde11ffc" + } + } +} \ No newline at end of file diff --git a/scoop/wtq-latest.json b/scoop/wtq-latest.json new file mode 100644 index 00000000..0501bf11 --- /dev/null +++ b/scoop/wtq-latest.json @@ -0,0 +1,20 @@ +{ + "version": "2.0.8", + "description": "Turn any app into a Quake-style toggleable app.", + "homepage": "https://github.com/flyingpie/windows-terminal-quake", + "bin": "wtq.exe", + "shortcuts": [ + [ + "wtq.exe", + "WTQ - Windows Terminal Quake" + ] + ], + "persist": "wtq.jsonc", + "checkver": "github", + "architecture": { + "64bit": { + "url": "https://github.com/flyingpie/windows-terminal-quake/releases/download/v2.0.8/win-x64_self-contained.zip", + "hash": "2fd44326aca5a34f7dcc84e2b37ba79c3395c4c301b5e38523020636fde11ffc" + } + } +} \ No newline at end of file diff --git a/scoop/wtq-nightly.json b/scoop/wtq-nightly.json index d9d3a03f..0501bf11 100644 --- a/scoop/wtq-nightly.json +++ b/scoop/wtq-nightly.json @@ -14,7 +14,7 @@ "architecture": { "64bit": { "url": "https://github.com/flyingpie/windows-terminal-quake/releases/download/v2.0.8/win-x64_self-contained.zip", - "hash": "1742b77eeb0896ee3e28cbbbacd79d28415b3a5637caca148612ddc39c2939fc" + "hash": "2fd44326aca5a34f7dcc84e2b37ba79c3395c4c301b5e38523020636fde11ffc" } } } \ No newline at end of file diff --git a/src/01-Build/NukeBuild/Build.cs b/src/01-Build/NukeBuild/Build.cs index 485c4060..53a0df8c 100644 --- a/src/01-Build/NukeBuild/Build.cs +++ b/src/01-Build/NukeBuild/Build.cs @@ -25,7 +25,7 @@ FetchDepth = 0, OnPushBranches = ["master"], EnableGitHubToken = true, - InvokedTargets = [nameof(PublishRelease)])] + InvokedTargets = [nameof(PublishDebug)])] [SuppressMessage("Major Bug", "S3903:Types should be defined in named namespaces", Justification = "MvdO: Build script.")] public sealed class Build : NukeBuild { @@ -170,8 +170,8 @@ public sealed class Build : NukeBuild var sha256 = Convert.ToHexString(await SHA256.HashDataAsync(File.OpenRead(PathToWin64SelfContainedZip))).ToLowerInvariant(); var manifest = tpl - .Replace("$PACKAGE_VERSION$", SemVerVersion, StringComparison.OrdinalIgnoreCase) .Replace("$GH_RELEASE_VERSION$", $"v{SemVerVersion}", StringComparison.OrdinalIgnoreCase) + .Replace("$PACKAGE_VERSION$", SemVerVersion, StringComparison.OrdinalIgnoreCase) .Replace("$SELF_CONTAINED_SHA256$", sha256, StringComparison.OrdinalIgnoreCase); await File.WriteAllTextAsync(RootDirectory / "scoop" / "wtq-latest.json", manifest); @@ -206,8 +206,9 @@ public sealed class Build : NukeBuild var target = manifestRoot / fn; var manifest = tpl - .Replace("$PACKAGE_VERSION$", SemVerVersion, StringComparison.OrdinalIgnoreCase) .Replace("$GH_RELEASE_VERSION$", $"v{SemVerVersion}", StringComparison.OrdinalIgnoreCase) + .Replace("$PACKAGE_VERSION$", SemVerVersion, StringComparison.OrdinalIgnoreCase) + .Replace("$RELEASE_DATE$", DateTimeOffset.UtcNow.ToString("yyyy-MM-dd"), StringComparison.OrdinalIgnoreCase) .Replace("$SELF_CONTAINED_SHA256$", sha256, StringComparison.OrdinalIgnoreCase); await File.WriteAllTextAsync(target, manifest); @@ -273,6 +274,7 @@ await GitHubTasks .Triggers(CreateWinGetManifest) .Executes(); + [SuppressMessage("Major Code Smell", "S1144:Unused private types or members should be removed", Justification = "MvdO: Invoked manually.")] private Target PublishRelease => _ => _ .DependsOn(Clean) .DependsOn(PublishWin64FrameworkDependent) diff --git a/src/30-Host/Wtq.Host.Windows/Program.cs b/src/30-Host/Wtq.Host.Windows/Program.cs index f7c16dd3..262b0154 100644 --- a/src/30-Host/Wtq.Host.Windows/Program.cs +++ b/src/30-Host/Wtq.Host.Windows/Program.cs @@ -6,6 +6,7 @@ using System; using System.IO; using System.Threading.Tasks; +using System.Windows.Forms; using Wtq.Configuration; using Wtq.Events; using Wtq.Service; @@ -110,6 +111,7 @@ await _host catch (Exception ex) { Console.WriteLine($"Error running application: {ex}"); + MessageBox.Show($"Error running application: {ex}", "Error starting WTQ"); } } } \ No newline at end of file diff --git a/src/Wtq.sln b/src/Wtq.sln index c2fbc31a..0221e232 100644 --- a/src/Wtq.sln +++ b/src/Wtq.sln @@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Sln", "00-Sln", "{79182C Directory.Packages.props = Directory.Packages.props global.json = global.json stylecop.json = stylecop.json + ..\VERSION = ..\VERSION wtq.jsonc = wtq.jsonc EndProjectSection EndProject diff --git a/src/wtq.jsonc b/src/wtq.jsonc index f7853198..423d3a0d 100644 --- a/src/wtq.jsonc +++ b/src/wtq.jsonc @@ -9,9 +9,6 @@ "Name": "PowerShell", "HotKeys": [{ "Modifiers": "Control", "Key": "D1" }], "FileName": "powershell" - }, - { - "AttachMode": "Find" } // Example with Windows Terminal diff --git a/winget/2.0.8/flyingpie.windows-terminal-quake.installer.yaml b/winget/2.0.8/flyingpie.windows-terminal-quake.installer.yaml new file mode 100644 index 00000000..1cb83e93 --- /dev/null +++ b/winget/2.0.8/flyingpie.windows-terminal-quake.installer.yaml @@ -0,0 +1,16 @@ +PackageIdentifier: flyingpie.windows-terminal-quake +PackageVersion: 2.0.8 +InstallerType: zip +NestedInstallerType: portable +NestedInstallerFiles: +- RelativeFilePath: wtq.exe + PortableCommandAlias: wtq +Commands: +- wtq +ReleaseDate: 2024-04-28 +Installers: +- Architecture: x64 + InstallerUrl: https://github.com/flyingpie/windows-terminal-quake/releases/download/v2.0.8/win-x64_self-contained.zip + InstallerSha256: 2fd44326aca5a34f7dcc84e2b37ba79c3395c4c301b5e38523020636fde11ffc +ManifestType: installer +ManifestVersion: 1.5.0 diff --git a/winget/2.0.8/flyingpie.windows-terminal-quake.locale.en-US.yaml b/winget/2.0.8/flyingpie.windows-terminal-quake.locale.en-US.yaml new file mode 100644 index 00000000..203c4d99 --- /dev/null +++ b/winget/2.0.8/flyingpie.windows-terminal-quake.locale.en-US.yaml @@ -0,0 +1,13 @@ +PackageIdentifier: flyingpie.windows-terminal-quake +PackageVersion: 2.0.8 +PackageLocale: en-US +Publisher: Flyingpie +PublisherUrl: http://flyingpie.nl/ +PackageName: windows-terminal-quake +PackageUrl: https://github.com/flyingpie/windows-terminal-quake +License: MIT +LicenseUrl: https://github.com/flyingpie/windows-terminal-quake/blob/master/LICENSE +ShortDescription: Turn any app into a Quake-style toggleable app. +Moniker: windows-terminal-quake +ManifestType: defaultLocale +ManifestVersion: 1.5.0 diff --git a/winget/2.0.8/flyingpie.windows-terminal-quake.yaml b/winget/2.0.8/flyingpie.windows-terminal-quake.yaml new file mode 100644 index 00000000..32a62cb7 --- /dev/null +++ b/winget/2.0.8/flyingpie.windows-terminal-quake.yaml @@ -0,0 +1,5 @@ +PackageIdentifier: flyingpie.windows-terminal-quake +PackageVersion: 2.0.8 +DefaultLocale: en-US +ManifestType: version +ManifestVersion: 1.5.0 diff --git a/winget/_template/flyingpie.windows-terminal-quake.installer.yaml b/winget/_template/flyingpie.windows-terminal-quake.installer.yaml index 1f57c63f..eaff1767 100644 --- a/winget/_template/flyingpie.windows-terminal-quake.installer.yaml +++ b/winget/_template/flyingpie.windows-terminal-quake.installer.yaml @@ -1,4 +1,4 @@ -PackageIdentifier: flyingpie.windows-terminal-quake.prerelease +PackageIdentifier: flyingpie.windows-terminal-quake PackageVersion: $PACKAGE_VERSION$ InstallerType: zip NestedInstallerType: portable diff --git a/winget/_template/flyingpie.windows-terminal-quake.locale.en-US.yaml b/winget/_template/flyingpie.windows-terminal-quake.locale.en-US.yaml index 49162e84..c6418650 100644 --- a/winget/_template/flyingpie.windows-terminal-quake.locale.en-US.yaml +++ b/winget/_template/flyingpie.windows-terminal-quake.locale.en-US.yaml @@ -1,13 +1,13 @@ -PackageIdentifier: flyingpie.windows-terminal-quake.prerelease +PackageIdentifier: flyingpie.windows-terminal-quake PackageVersion: $PACKAGE_VERSION$ PackageLocale: en-US Publisher: Flyingpie PublisherUrl: http://flyingpie.nl/ -PackageName: windows-terminal-quake-prerelease +PackageName: windows-terminal-quake PackageUrl: https://github.com/flyingpie/windows-terminal-quake License: MIT LicenseUrl: https://github.com/flyingpie/windows-terminal-quake/blob/master/LICENSE ShortDescription: Turn any app into a Quake-style toggleable app. -Moniker: windows-terminal-quake-prerelease +Moniker: windows-terminal-quake ManifestType: defaultLocale ManifestVersion: 1.5.0 diff --git a/winget/_template/flyingpie.windows-terminal-quake.yaml b/winget/_template/flyingpie.windows-terminal-quake.yaml index 860c295c..bef04601 100644 --- a/winget/_template/flyingpie.windows-terminal-quake.yaml +++ b/winget/_template/flyingpie.windows-terminal-quake.yaml @@ -1,4 +1,4 @@ -PackageIdentifier: flyingpie.windows-terminal-quake.prerelease +PackageIdentifier: flyingpie.windows-terminal-quake PackageVersion: $PACKAGE_VERSION$ DefaultLocale: en-US ManifestType: version