From aef19929a8bab93b258c1d2bf434828925610a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Tue, 12 Mar 2024 08:43:52 +0100 Subject: [PATCH] Simplify getting the deps.json stream --- tests/TestApp/Program.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/TestApp/Program.cs b/tests/TestApp/Program.cs index 6c2bab9..4b7ae5b 100644 --- a/tests/TestApp/Program.cs +++ b/tests/TestApp/Program.cs @@ -32,8 +32,7 @@ static IEnumerable EnumerateDlls(string appPath) { - var depsJsonFile = new FileInfo(Path.ChangeExtension(appPath, ".deps.json")); - using var depsJsonStream = depsJsonFile.Exists ? depsJsonFile.OpenRead() : GetEmbeddedJsonDepsStream(appPath); + using var depsJsonStream = GetJsonDepsStream(appPath); using var reader = new DependencyContextJsonReader(); var dependencyContext = reader.Read(depsJsonStream); @@ -49,7 +48,7 @@ static IEnumerable EnumerateDlls(string appPath) } // See https://github.com/0xced/SingleFileAppDependencyContext -static Stream GetEmbeddedJsonDepsStream(string appPath) +static Stream GetJsonDepsStream(string appPath) { var depsJsonRegex = new Regex(@"DepsJson Offset:\[([0-9a-fA-F]+)\] Size\[([0-9a-fA-F]+)\]", RegexOptions.Compiled | RegexOptions.IgnoreCase); var startInfo = new ProcessStartInfo(appPath) @@ -94,5 +93,5 @@ static Stream GetEmbeddedJsonDepsStream(string appPath) return appHostFile.CreateViewStream(depsJsonOffset.Value, depsJsonSize.Value, MemoryMappedFileAccess.Read); } - throw new InvalidOperationException("The .deps.json location was not found in the AppHost logs"); + return new FileStream(Path.ChangeExtension(appPath, ".deps.json"), FileMode.Open); } \ No newline at end of file