diff --git a/CHANGES b/CHANGES index c21d4c2..1ed816e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,7 @@ + Version 1.0.2; 2023-04-18 - The pupnet.conf file upgraded to version 1.3.0 - Now builds using .NET6, rather than .NET7 (you can change this in csproj file if needed) +- Reinstated key-press to exit on all deployments + Version 1.0.1; 2023-03-26 - Programs now asks for key-press only on Windows diff --git a/HelloWorld.pupnet.conf b/HelloWorld.pupnet.conf index a870e52..37a0c1f 100644 --- a/HelloWorld.pupnet.conf +++ b/HelloWorld.pupnet.conf @@ -21,7 +21,7 @@ AppId = zone.kuiper.helloworld # brackets to denote package release, i.e. '1.2.3[1]'. Release refers to a change to the deployment # package, rather the application. If release part is absent (i.e. '1.2.3'), the release value defaults # to '1'. Note that the version-release value given here may be overridden from the command line. -AppVersionRelease = 1.0.1[3] +AppVersionRelease = 1.0.2[1] # Mandatory single line application description. AppShortSummary = A Hello World application @@ -119,7 +119,7 @@ IconFiles = """ # file, or the directory containing it. If empty (default), a single project or solution file is # expected under the same directory as this file. IMPORTANT. If set to 'NONE', dotnet publish # is disabled (not called). Instead, only DotnetPostPublish is called. -DotnetProjectPath = +DotnetProjectPath = # Optional arguments supplied to 'dotnet publish'. Do NOT include '-r' (runtime), app version, or '-c' # (configuration) here as they will be added (i.e. via AppVersionRelease). Typically you want as a @@ -163,7 +163,7 @@ OutputDirectory = Deploy/bin ######################################## # Additional arguments for use with appimagetool. Useful for signing. Default is empty. -AppImageArgs = +AppImageArgs = # Boolean (true or false) which sets whether to include the application version in the AppImage filename, # i.e. 'HelloWorld-1.2.3-x86_64.AppImage'. Default is false. It is ignored if the output filename is @@ -199,7 +199,7 @@ FlatpakFinishArgs = """ # Additional arguments for use with flatpak-builder. Useful for signing. Default is empty. # See flatpak-builder --help. -FlatpakBuilderArgs = +FlatpakBuilderArgs = ######################################## # RPM OPTIONS @@ -267,12 +267,12 @@ SetupMinWindowsVersion = 10 # Optional name and parameters of the Sign Tool to be used to digitally sign: the installer, # uninstaller, and contained exe and dll files. If empty, files will not be signed. # See: https://jrsoftware.org/ishelp/topic_setup_signtool.htm -SetupSignTool = +SetupSignTool = # Optional suffix for the installer output filename. The default is empty, but you may wish set it to: # 'Setup' or similar. This, for example, will output a file of name: HelloWorldSetup-x86_64.exe # Ignored if the output filename is specified at command line. -SetupSuffixOutput = +SetupSuffixOutput = # Boolean (true or false) which sets whether to include the application version in the setup filename, # i.e. 'HelloWorld-1.2.3-x86_64.exe'. Default is false. Ignored if the output filename is specified diff --git a/HelloWorld/Program.cs b/HelloWorld/Program.cs index 174c98b..3071b7d 100644 --- a/HelloWorld/Program.cs +++ b/HelloWorld/Program.cs @@ -67,13 +67,12 @@ static void Main(string[] args) Console.WriteLine("pupnet was NOT called with: --property DefineConstants=CUSTOM_FLAG"); #endif - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - Console.WriteLine(); - Console.WriteLine(); - Console.WriteLine("Press any key to finish"); - Console.ReadKey(false); - } + Console.WriteLine(); + Console.WriteLine(); + Console.WriteLine("Press any key to finish"); + + // This line was proving problematic on arm64 AppImage (but have changed runtime since) + Console.ReadKey(false); Console.WriteLine(); }