notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[shared] Improve fork version string handling

Browse source
This commit is contained in:
Laura Hausmann 2024-11-03 22:29:19 +01:00
parent 8d29869f76
commit c40c13261d
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Iceshrimp.Backend/Core/Configuration/Constants.cs
View file

@ -11,6 +11,8 @@ public static class Constants
// Leave this as-is, unless you've forked the project & want to reference your own website / repository (irrelevant for license compliance) // Leave this as-is, unless you've forked the project & want to reference your own website / repository (irrelevant for license compliance)
public const string ProjectHomepageUrl = "https://iceshrimp.dev/iceshrimp/Iceshrimp.NET"; public const string ProjectHomepageUrl = "https://iceshrimp.dev/iceshrimp/Iceshrimp.NET";
// Make sure to also update VersionHelpers.VersionIdentifier if you are building a fork
public const string ActivityStreamsNs = "https://www.w3.org/ns/activitystreams"; public const string ActivityStreamsNs = "https://www.w3.org/ns/activitystreams";
public const string W3IdSecurityNs = "https://w3id.org/security"; public const string W3IdSecurityNs = "https://w3id.org/security";
public const string PurlDcNs = "http://purl.org/dc/terms"; public const string PurlDcNs = "http://purl.org/dc/terms";

25
Iceshrimp.Shared/Helpers/VersionHelpers.cs
View file

@ -6,6 +6,10 @@ public record VersionInfo(string Version, string RawVersion, string Codename, st
public static class VersionHelpers public static class VersionHelpers
{ {
// Leave this as-is, unless you've forked the project. Set to a shorthand string that identifies your fork.
// Gets appended to the version string like this: v1234.5+fork.commit
private const string VersionIdentifier = "upstream";
public static VersionInfo GetVersionInfo() public static VersionInfo GetVersionInfo()
{ {
var attributes = Assembly.GetExecutingAssembly() var attributes = Assembly.GetExecutingAssembly()
@ -37,10 +41,29 @@ public static class VersionHelpers
// If we have a git revision, limit it to 10 characters // If we have a git revision, limit it to 10 characters
if (fullVersion.Split('+') is { Length: 2 } split) if (fullVersion.Split('+') is { Length: 2 } split)
{
int maxLength;
#pragma warning disable CS8519 // The given expression never matches the provided pattern.
#pragma warning disable CS8793 // The input always matches the provided pattern.
#pragma warning disable CS8794 // The given expression always matches the provided pattern.
// ReSharper disable HeuristicUnreachableCode
// ReSharper disable once RedundantIfElseBlock
if (VersionIdentifier is not "upstream")
{
split[1] = $"{VersionIdentifier}.{split[1]}";
maxLength = VersionIdentifier.Length + 1;
}
else
{ {
// Accomodate for fork information, e.g. version+fork.commit // Accomodate for fork information, e.g. version+fork.commit
var extra = split[1].Split("."); var extra = split[1].Split(".");
var maxLength = extra.Length == 2 ? extra[0].Length + 1 : 0; maxLength = extra.Length == 2 ? extra[0].Length + 1 : 0;
}
// ReSharper restore HeuristicUnreachableCode
#pragma warning restore CS8519 // The given expression never matches the provided pattern.
#pragma warning restore CS8794 // The input always matches the provided pattern.
#pragma warning restore CS8793 // The given expression always matches the provided pattern.
maxLength += Math.Min(split[1].Length, 10); maxLength += Math.Min(split[1].Length, 10);
commitHash = split[1]; commitHash = split[1];