mirror of
https://github.com/cyanfish/naps2.git
synced 2024-08-16 18:50:45 +03:00
Tools: Prevent custom name from overwriting platform
This commit is contained in:
parent
2035d4a1f2
commit
f112d9f054
@ -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();
|
||||
|
@ -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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user