From 43c2fc2c0af71905530531ad35acff7bb51d99d7 Mon Sep 17 00:00:00 2001 From: kuiper Date: Tue, 26 Sep 2023 03:11:34 +0100 Subject: [PATCH] Version 1.7.1 --- CHANGES | 4 ++++ PupNet.pupnet.conf | 26 +++++++++++++------------- PupNet/ConfigurationReader.cs | 2 +- publish.sh | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/CHANGES b/CHANGES index 5399fa4..d2b1b7d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ ++ VERSION 1.7.1; 2023-10-26 +- Bugfix: Fix upgrade-conf bug introduced in 1.7.0. + + + VERSION 1.7.0; 2023-10-25 - Feature #24: Automatically skips confirmation if environment variable "CI=true" is defined. - Other minor tweaks. diff --git a/PupNet.pupnet.conf b/PupNet.pupnet.conf index f6c20fd..a2163b8 100644 --- a/PupNet.pupnet.conf +++ b/PupNet.pupnet.conf @@ -1,4 +1,4 @@ -# PUPNET DEPLOY: 1.7.0 +# PUPNET DEPLOY: 1.7.1 # Use: 'pupnet --help conf' for information. # APP PREAMBLE @@ -10,11 +10,11 @@ AppShortSummary = Cross-platform deployment utility which packages your .NET pro AppDescription = """ PupNet Deploy is a cross-platform deployment utility which packages your .NET project as a ready-to-ship installation file in a single step. - + It has been possible to cross-compile console C# applications for sometime now. More recently, the cross-platform Avalonia replacement for WPF allows fully-featured GUI applications to target a range of platforms, including: Linux, Windows, MacOS and Android. - + Now, PupNet Deploy allows you to ship your dotnet application as: * AppImage for Linux * Setup File for Windows @@ -22,7 +22,7 @@ AppDescription = """ * Debian Binary Package * RPM Binary Package * Plain old Zip - + PupNet has good support for internationalization, desktop icons, publisher metadata and custom build operations. Although developed for .NET, it is also possible to use it to deploy C++ and other kinds of applications. """ @@ -40,7 +40,7 @@ PublisherEmail = contact@kuiper.zone # DESKTOP INTEGRATION DesktopNoDisplay = true DesktopTerminal = true -DesktopFile = +DesktopFile = StartCommand = pupnet PrimeCategory = Development MetaFile = Deploy/PupNet.metainfo.xml @@ -57,17 +57,17 @@ IconFiles = """ """ # DOTNET PUBLISH -DotnetProjectPath = +DotnetProjectPath = DotnetPublishArgs = -p:Version=${APP_VERSION} --self-contained true -p:PublishReadyToRun=true -p:DebugType=None -p:DebugSymbols=false -DotnetPostPublish = -DotnetPostPublishOnWindows = +DotnetPostPublish = +DotnetPostPublishOnWindows = # PACKAGE OUTPUT PackageName = PupNet-Deploy OutputDirectory = Deploy/OUT # APPIMAGE OPTIONS -AppImageArgs = +AppImageArgs = AppImageVersionOutput = false # FLATPAK OPTIONS @@ -80,7 +80,7 @@ FlatpakFinishArgs = """ --filesystem=host --share=network """ -FlatpakBuilderArgs = +FlatpakBuilderArgs = # RPM OPTIONS RpmAutoReq = false @@ -109,6 +109,6 @@ DebianRecommends = """ SetupAdminInstall = false SetupCommandPrompt = PupNet Console SetupMinWindowsVersion = 10 -SetupSignTool = -SetupSuffixOutput = -SetupVersionOutput = false \ No newline at end of file +SetupSignTool = +SetupSuffixOutput = +SetupVersionOutput = true \ No newline at end of file diff --git a/PupNet/ConfigurationReader.cs b/PupNet/ConfigurationReader.cs index ea4d131..a870bfe 100644 --- a/PupNet/ConfigurationReader.cs +++ b/PupNet/ConfigurationReader.cs @@ -351,7 +351,7 @@ public string ToString(DocStyles style) if (style == DocStyles.NoComments) { - sb.Append($"# Use: '{Program.CommandName} --{ArgumentReader.HelpLongArg} conf' for information."); + sb.AppendLine($"# Use: '{Program.CommandName} --{ArgumentReader.HelpLongArg} conf' for information."); } } diff --git a/publish.sh b/publish.sh index 0e0cb0a..9feaa1b 100755 --- a/publish.sh +++ b/publish.sh @@ -1,4 +1,4 @@ -dotnet pack -c Release -o ./Deploy/OUT -p:Version=1.7.0 +dotnet pack -c Release -o ./Deploy/OUT -p:Version=1.7.1 pupnet -r linux-x64 -k deb -y pupnet -r linux-x64 -k rpm -y pupnet -r linux-x64 -k appimage -y