cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-08-16 18:50:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tools: Prevent custom name from overwriting platform

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2024-04-06 09:48:26 -07:00
parent 2035d4a1f2
commit f112d9f054
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NAPS2.Tools/Project/Packaging/InnoSetupPackager.cs
View File

@ -26,7 +26,7 @@ public static class InnoSetupPackager
var defLines = new StringBuilder();
defLines.AppendLine($"#define AppVersion \"{packageInfo.VersionNumber}\"");
defLines.AppendLine($"#define AppVersionName \"{packageInfo.VersionName}\"");
defLines.AppendLine($"#define AppPlatform \"{packageInfo.PackageName ?? packageInfo.Platform.PackageName()}\"");
defLines.AppendLine($"#define AppPlatform \"{packageInfo.PackageName}\"");
template = template.Replace("; !defs", defLines.ToString());
var arch = new StringBuilder();

4
NAPS2.Tools/Project/Packaging/PackageInfo.cs
View File

@ -12,7 +12,7 @@ public class PackageInfo
Platform = platform;
VersionName = versionName;
VersionNumber = versionNumber;
PackageName = packageName;
PackageName = packageName == null ? platform.PackageName() : $"{platform.PackageName()}-{packageName}";;
}
public Platform Platform { get; }
@ -21,7 +21,7 @@ public class PackageInfo
public string VersionNumber { get; }
public string? PackageName { get; }
public string PackageName { get; }
public string GetPath(string ext)
{