Fix assembly location lookups

ppy · Dec 16, 2022 · dd9a418 · dd9a418
1 parent de079e0
commit dd9a418
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -185,7 +185,7 @@ public IBeatmap GetBeatmap(string name)
 
         private Stream openResource(string name)
         {
-            string localPath = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().Location).Path)).AsNonNull();
+            string localPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location).AsNonNull();
             return Assembly.LoadFrom(Path.Combine(localPath, $"{ResourceAssembly}.dll")).GetManifestResourceStream($@"{ResourceAssembly}.Resources.{name}");
         }
 

diff --git a/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs b/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System;
 using System.IO;
 using System.Reflection;
 using NUnit.Framework;
@@ -54,7 +53,7 @@ private IWorkingBeatmap getBeatmap(string name)
 
         private Stream openResource(string name)
         {
-            string localPath = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().Location).Path)).AsNonNull();
+            string localPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location).AsNonNull();
             return Assembly.LoadFrom(Path.Combine(localPath, $"{ResourceAssembly}.dll")).GetManifestResourceStream($@"{ResourceAssembly}.Resources.{name}");
         }