Merge pull request #33680 from peppy/make-release-streams-work-in-version

Add support for reading and displaying the release stream suffix

Author: bdach

osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs

@@ -107,7 +107,7 @@ public void ShowWithBuild(bool isSupporter)
             {
                 Version = "2018.712.0",
                 DisplayVersion = "2018.712.0",
-                UpdateStream = streams[OsuGameBase.CLIENT_STREAM_NAME],
+                UpdateStream = streams["lazer"],
                 CreatedAt = new DateTime(2018, 7, 12),
                 ChangelogEntries = new List<APIChangelogEntry>
                 {

osu.Game/Online/API/Requests/Responses/APIUpdateStream.cs

@@ -39,7 +39,8 @@ public class APIUpdateStream : IEquatable<APIUpdateStream>
             ["stable"] = new Color4(34, 153, 187, 255),
             ["beta40"] = new Color4(255, 221, 85, 255),
             ["cuttingedge"] = new Color4(238, 170, 0, 255),
-            [OsuGameBase.CLIENT_STREAM_NAME] = new Color4(237, 18, 33, 255),
+            ["lazer"] = new Color4(237, 18, 33, 255),
+            ["tachyon"] = new Color4(206, 0, 255, 255),
             ["web"] = new Color4(136, 102, 238, 255)
         };
 

osu.Game/OsuGame.cs

@@ -519,7 +519,7 @@ public void HandleLink(LinkDetails link) => Schedule(() =>
                     else
                     {
                         string[] changelogArgs = argString.Split("/");
-                        ShowChangelogBuild(changelogArgs[0], changelogArgs[1]);
+                        ShowChangelogBuild($"{changelogArgs[1]}-{changelogArgs[0]}");
                     }
 
                     break;
@@ -600,9 +600,8 @@ public void ShowChannel(string channel) => waitForReady(() => channelManager, _
         /// <summary>
         /// Show changelog's build as an overlay
         /// </summary>
-        /// <param name="updateStream">The update stream name</param>
-        /// <param name="version">The build version of the update stream</param>
-        public void ShowChangelogBuild(string updateStream, string version) => waitForReady(() => changelogOverlay, _ => changelogOverlay.ShowBuild(updateStream, version));
+        /// <param name="version">The build version, including stream suffix.</param>
+        public void ShowChangelogBuild(string version) => waitForReady(() => changelogOverlay, _ => changelogOverlay.ShowBuild(version));
 
         /// <summary>
         /// Joins a multiplayer or playlists room with the given <paramref name="id"/>.
@@ -1025,6 +1024,10 @@ protected override void LoadComplete()
             if (RuntimeInfo.EntryAssembly.GetCustomAttribute<OfficialBuildAttribute>() == null)
                 Logger.Log(NotificationsStrings.NotOfficialBuild.ToString());
 
+            // Make sure the release stream setting matches the build which was just run.
+            if (Enum.TryParse<ReleaseStream>(Version.Split('-').Last(), true, out var releaseStream))
+                LocalConfig.SetValue(OsuSetting.ReleaseStream, releaseStream);
+
             var languages = Enum.GetValues<Language>();
 
             var mappings = languages.Select(language =>

osu.Game/OsuGameBase.cs

@@ -83,8 +83,6 @@ public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncPro
 
         public const string OSU_PROTOCOL = "osu://";
 
-        public const string CLIENT_STREAM_NAME = @"lazer";
-
         /// <summary>
         /// The filename of the main client database.
         /// </summary>
@@ -120,17 +118,23 @@ public virtual EndpointConfiguration CreateEndpoints() =>
 
         public bool IsDeployedBuild => AssemblyVersion.Major > 0;
 
-        internal const string BUILD_SUFFIX = "lazer";
-
         public virtual string Version
         {
             get
             {
                 if (!IsDeployedBuild)
                     return @"local " + (DebugUtils.IsDebugBuild ? @"debug" : @"release");
 
-                var version = AssemblyVersion;
-                return $@"{version.Major}.{version.Minor}.{version.Build}-{BUILD_SUFFIX}";
+                string informationalVersion = Assembly.GetEntryAssembly()?
+                    .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
+                    .InformationalVersion;
+
+                // Example: [assembly: AssemblyInformationalVersion("2025.613.0-tachyon+d934e574b2539e8787956c3c9ecce9dadebb10ee")]
+                if (!string.IsNullOrEmpty(informationalVersion))
+                    return informationalVersion.Split('+').First();
+
+                Version version = AssemblyVersion;
+                return $@"{version.Major}.{version.Minor}.{version.Build}-lazer";
             }
         }
 

osu.Game/Overlays/ChangelogOverlay.cs

@@ -76,16 +76,18 @@ public void ShowBuild([NotNull] APIChangelogBuild build)
             Show();
         }
 
-        public void ShowBuild([NotNull] string updateStream, [NotNull] string version)
+        public void ShowBuild([NotNull] string version)
         {
-            ArgumentNullException.ThrowIfNull(updateStream);
             ArgumentNullException.ThrowIfNull(version);
 
             Show();
 
             performAfterFetch(() =>
             {
-                var build = builds.Find(b => b.Version == version && b.UpdateStream.Name == updateStream)
+                string versionPart = version.Split('-')[0];
+                string updateStream = version.Split('-')[1];
+
+                var build = builds.Find(b => b.Version == versionPart && b.UpdateStream.Name == updateStream)
                             ?? Streams.Find(s => s.Name == updateStream)?.LatestBuild;
 
                 if (build != null)

osu.Game/Overlays/Settings/SettingsFooter.cs

@@ -100,7 +100,7 @@ public BuildDisplay(string version)
             [BackgroundDependencyLoader]
             private void load(ChangelogOverlay? changelog)
             {
-                Action = () => changelog?.ShowBuild(OsuGameBase.CLIENT_STREAM_NAME, version);
+                Action = () => changelog?.ShowBuild(version);
 
                 Add(new OsuSpriteText
                 {

osu.Game/Updater/UpdateManager.cs

@@ -111,7 +111,7 @@ private void load(OsuColour colours, ChangelogOverlay changelog, INotificationOv
                 Activated = delegate
                 {
                     notificationOverlay.Hide();
-                    changelog.ShowBuild(OsuGameBase.CLIENT_STREAM_NAME, version);
+                    changelog.ShowBuild(version);
                     return true;
                 };
             }

osu.Game/Utils/SentryLogger.cs

@@ -52,7 +52,7 @@ public SentryLogger(OsuGame game, Storage? storage = null)
                 options.IsGlobalModeEnabled = true;
                 options.CacheDirectoryPath = storage?.GetFullPath(string.Empty);
                 // The reported release needs to match version as reported to Sentry in .github/workflows/sentry-release.yml
-                options.Release = $"osu@{game.Version.Replace($@"-{OsuGameBase.BUILD_SUFFIX}", string.Empty)}";
+                options.Release = $"osu@{game.Version.Split('-').First()}";
             });
 
             Logger.NewEntry += processLogEntry;