Skip to content

Commit 8b52d8e

Browse files
kuiperzonekuiperzone
committed
v1.2.2 RC
1 parent 60a565b commit 8b52d8e

16 files changed

+53
-23
lines changed

‎CHANGES

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
+ VERSION 1.2.2; 2023-04-14
2+
- Now supplied as .NET6 tool (explicitly built against .NET6 LTS rather than .NET7)
3+
- Bug fix: AppImage failed to run on some systems (updated AppImage runtimes)
4+
- Big fix: Added 'BuildRequires: desktop-file-utils' to RPM spec file
5+
- Ships with: appimagetool 13 (2020-12-31)
6+
- Tested against: rpmbuild RPM version 4.18.0, dpkg 1.21.21, flatpak-builder 1.2.3, InnoSetup 6.2.2
7+
18
+ VERSION 1.2.1; 2023-04-13
29
- Bug fix: Unable to show --help or --version due to recent changes
310
- Ships with: appimagetool 13 (2020-12-31)

‎Deploy/PupNet.metainfo.xml

+12
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,18 @@
6666

6767
<releases>
6868

69+
<release version="1.2.2" date="2023-04-14">
70+
<description>
71+
<ul>
72+
<li>Now supplied as .NET6 tool (explicitly built against .NET6 LTS rather than .NET7)</li>
73+
<li>Bug fix: AppImage failed to run on some systems (updated AppImage runtimes)</li>
74+
<li>Bug fix: Added 'BuildRequires: desktop-file-utils' to RPM spec file</li>
75+
<li>Ships with: appimagetool 13 (2020-12-31)</li>
76+
<li>Tested against: rpmbuild RPM version 4.18.0, dpkg 1.21.21, flatpak-builder 1.2.3, InnoSetup 6.2.2</li>
77+
</ul>
78+
</description>
79+
</release>
80+
6981
<release version="1.2.1" date="2023-04-13">
7082
<description>
7183
<ul>

‎PupNet.Test/PupNet.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPublishable>false</IsPublishable>

‎PupNet.pupnet.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
AppBaseName = PupNet
55
AppFriendlyName = PupNet Deploy
66
AppId = zone.kuiper.pupnet
7-
AppVersionRelease = 1.2.1[1]
7+
AppVersionRelease = 1.2.2[1]
88
AppShortSummary = Cross-platform deployment utility which packages your .NET project as a ready-to-ship installation file in a single step.
99
AppLicenseId = AGPL-3.0-or-later
1010
AppLicenseFile = LICENSE

‎PupNet/Assets/Thumbs.db:encryptable

Whitespace-only changes.

‎PupNet/Assets/runtime-aarch64

193 KB
Binary file not shown.

‎PupNet/Assets/runtime-armhf

140 KB
Binary file not shown.

‎PupNet/Assets/runtime-fuse2-aarch64

-492 KB
Binary file not shown.

‎PupNet/Assets/runtime-fuse2-armhf

-316 KB
Binary file not shown.

‎PupNet/Assets/runtime-fuse2-x86_64

-580 KB
Binary file not shown.

‎PupNet/Assets/runtime-x86_64

185 KB
Binary file not shown.

‎PupNet/Builders/AppImageBuilder.cs

+5-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
// with PupNet. If not, see <https://www.gnu.org/licenses/>.
1717
// -----------------------------------------------------------------------------
1818

19-
using System;
2019
using System.Runtime.InteropServices;
2120

2221
namespace KuiperZone.PupNet.Builders;
@@ -184,23 +183,23 @@ public override string? MetaBuildPath
184183
/// <exception cref="ArgumentException"/>
185184
public static string GetRuntimePath(Architecture arch)
186185
{
187-
// https://github.com/AppImage/type2-runtime/releases/tag/continuous
186+
// From: https://github.com/AppImage/AppImageKit/releases/tag/13
188187
if (arch == System.Runtime.InteropServices.Architecture.X64)
189188
{
190-
return Path.Combine(AssemblyDirectory, "runtime-fuse2-x86_64");
189+
return Path.Combine(AssemblyDirectory, "runtime-x86_64");
191190
}
192191

193192
if (arch == System.Runtime.InteropServices.Architecture.Arm64)
194193
{
195-
return Path.Combine(AssemblyDirectory, "runtime-fuse2-aarch64");
194+
return Path.Combine(AssemblyDirectory, "runtime-aarch64");
196195
}
197196

198197
if (arch == System.Runtime.InteropServices.Architecture.Arm)
199198
{
200-
return Path.Combine(AssemblyDirectory, "runtime-fuse2-armhf");
199+
return Path.Combine(AssemblyDirectory, "runtime-armhf");
201200
}
202201

203-
throw new ArgumentException($"Unsupported runtime architecture {arch} - must be one of: x64, arm64, x86, arm");
202+
throw new ArgumentException($"Unsupported runtime architecture {arch} - must be one of: x64, arm64, arm");
204203
}
205204

206205

‎PupNet/Builders/RpmBuilder.cs

+1
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ private string GetSpec()
210210

211211
if (DesktopBuildPath != null || MetaBuildPath != null)
212212
{
213+
sb.AppendLine("BuildRequires: desktop-file-utils");
213214
sb.AppendLine("BuildRequires: libappstream-glib");
214215
sb.AppendLine();
215216
sb.AppendLine("%check");

‎PupNet/ConfigurationReader.cs

+2-11
Original file line numberDiff line numberDiff line change
@@ -775,19 +775,10 @@ private string GetMandatory(string name, ValueFlags flags)
775775
throw new ArgumentException($"Configuration {name} must contain at least 2 characters");
776776
}
777777

778-
/*
779-
// Don't do this - too strict for many fields
780-
// Leave it to Debian to fail if this is a problem
781-
if (char.IsDigit(value[0]))
782-
{
783-
throw new ArgumentException($"Configuration {name} cannot start with a numeric digit");
784-
}
785-
*/
786-
787778
foreach (var c in value)
788779
{
789780
// Not force lower case, but we will convert as needed
790-
if (c != '-' && c != '+' && c != '.' && !char.IsAsciiLetterOrDigit(c))
781+
if (c != '-' && c != '+' && c != '.' && (c < 'A' || c > 'Z') && (c < 'a' || c > 'z') && (c < '0' || c > '9'))
791782
{
792783
if (c != '\n' || !flags.HasFlag(ValueFlags.Multi))
793784
{
@@ -825,7 +816,7 @@ private string AssertPathFlags(string name, string value, ValueFlags flags)
825816
value = Path.Combine(LocalDirectory, value);
826817
}
827818

828-
if (flags.HasFlag(ValueFlags.AssertPath) && !Path.Exists(value))
819+
if (flags.HasFlag(ValueFlags.AssertPath) && !File.Exists(value) && !Directory.Exists(value))
829820
{
830821
throw new FileNotFoundException($"Configuration {name} path not found {value}");
831822
}

‎PupNet/PupNet.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88

@@ -47,13 +47,13 @@
4747
</None>
4848

4949

50-
<None Include="$(ProjectDir)\Assets\runtime-fuse2-x86_64" Link="runtime-fuse2-x86_64">
50+
<None Include="$(ProjectDir)\Assets\runtime-x86_64" Link="runtime-x86_64">
5151
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5252
</None>
53-
<None Include="$(ProjectDir)\Assets\runtime-fuse2-aarch64" Link="runtime-fuse2-aarch64">
53+
<None Include="$(ProjectDir)\Assets\runtime-aarch64" Link="runtime-aarch64">
5454
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5555
</None>
56-
<None Include="$(ProjectDir)\Assets\runtime-fuse2-armhf" Link="runtime-fuse2-armhf">
56+
<None Include="$(ProjectDir)\Assets\runtime-armhf" Link="runtime-armhf">
5757
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5858
</None>
5959

‎TODO

+20
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
Remove RPM desktop-file-validate or add to "BuildRequires"
2+
3+
RPM "AutoReqProv" - investigate?
4+
5+
Add "Requires" conf section for RPM and DEB:
6+
https://github.com/kuiperzone/PupNet-Deploy/issues/10
7+
18
Add multiple --kind values to arguments?
9+
10+
Drop to .NET6 for tool
11+
12+
Currently, ship runtime from:
13+
https://github.com/AppImage/type2-runtime/releases/tag/continuous
14+
as hinted at on AppImageKit page
15+
16+
However, think we should use runtimes from:
17+
https://github.com/AppImage/AppImageKit/releases/tag/13
18+
19+
Add parsable "changes" and integrate with RPM,deb and AppStream
20+
21+

0 commit comments

Comments
 (0)