Merge pull request #30956 from peppy/named-pipe

Fix osu! sometimes not starting when WSL is running in the background
ppy · Dec 7, 2024 · 3e7005d · 3e7005d
2 parents 5849a69 + b9f1fef
commit 3e7005d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/osu.Android.props b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.1205.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.1206.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.

diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
@@ -99,7 +99,7 @@ public static void Main(string[] args)
 
             var hostOptions = new HostOptions
             {
-                IPCPort = !tournamentClient ? OsuGame.IPC_PORT : null,
+                IPCPipeName = !tournamentClient ? OsuGame.IPC_PIPE_NAME : null,
                 FriendlyGameName = OsuGameBase.GAME_NAME,
             };
 

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneInterProcessCommunication.cs b/osu.Game.Tests/Visual/Navigation/TestSceneInterProcessCommunication.cs
@@ -63,7 +63,7 @@ public override void SetUpSteps()
             });
             AddStep("create IPC sender channels", () =>
             {
-                ipcSenderHost = new HeadlessGameHost(gameHost.Name, new HostOptions { IPCPort = OsuGame.IPC_PORT });
+                ipcSenderHost = new HeadlessGameHost(gameHost.Name, new HostOptions { IPCPipeName = OsuGame.IPC_PIPE_NAME });
                 osuSchemeLinkIPCSender = new OsuSchemeLinkIPCChannel(ipcSenderHost);
                 archiveImportIPCSender = new ArchiveImportIPCChannel(ipcSenderHost);
             });

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
@@ -87,9 +87,9 @@ public partial class OsuGame : OsuGameBase, IKeyBindingHandler<GlobalAction>, IL
     {
 #if DEBUG
         // Different port allows running release and debug builds alongside each other.
-        public const int IPC_PORT = 44824;
+        public const string IPC_PIPE_NAME = "osu-lazer-debug";
 #else
-        public const int IPC_PORT = 44823;
+        public const string IPC_PORT = "osu-lazer";
 #endif
 
         /// <summary>

diff --git a/osu.Game/Tests/CleanRunHeadlessGameHost.cs b/osu.Game/Tests/CleanRunHeadlessGameHost.cs
@@ -27,7 +27,7 @@ public CleanRunHeadlessGameHost(bool bindIPC = false, bool realtime = true, bool
                                         [CallerMemberName] string callingMethodName = @"")
             : base($"{callingMethodName}-{Guid.NewGuid()}", new HostOptions
             {
-                IPCPort = bindIPC ? OsuGame.IPC_PORT : null,
+                IPCPipeName = bindIPC ? OsuGame.IPC_PIPE_NAME : null,
             }, bypassCleanup: bypassCleanupOnDispose, realtime: realtime)
         {
             this.bypassCleanupOnSetup = bypassCleanupOnSetup;

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2024.1205.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2024.1206.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2024.1202.0" />
     <PackageReference Include="Sentry" Version="4.13.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->

diff --git a/osu.iOS.props b/osu.iOS.props
@@ -17,6 +17,6 @@
     <MtouchInterpreter>-all</MtouchInterpreter>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2024.1205.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2024.1206.0" />
   </ItemGroup>
 </Project>