Cleanup in ScriptDependencyContextReader

seesharper · seesharper · commit b61d16e4b213 · 2022-11-25T13:29:27.000+01:00
diff --git a/src/Dotnet.Script.DependencyModel/Context/ScriptDependencyContextReader.cs b/src/Dotnet.Script.DependencyModel/Context/ScriptDependencyContextReader.cs
@@ -4,18 +4,13 @@
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
-using System.Xml.Linq;
 using Dotnet.Script.DependencyModel.Environment;
 using Dotnet.Script.DependencyModel.Logging;
-using Dotnet.Script.DependencyModel.ProjectSystem;
 using Dotnet.Script.DependencyModel.ScriptPackage;
-using Microsoft.DotNet.PlatformAbstractions;
 using NuGet.Common;
 using NuGet.Packaging;
 using NuGet.ProjectModel;
-using NuGet.RuntimeModel;
 using NuGet.Versioning;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace Dotnet.Script.DependencyModel.Context
@@ -72,7 +67,6 @@ public ScriptDependencyContext ReadDependencyContext(string pathToAssetsFile)
                 var netcoreAppRuntimeAssemblies = Directory.GetFiles(netcoreAppRuntimeAssemblyLocation, "*.dll").Where(IsAssembly).ToArray();
                 var netCoreAppDependency = new ScriptDependency("Microsoft.NETCore.App", ScriptEnvironment.Default.NetCoreVersion.Version, netcoreAppRuntimeAssemblies, Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>());
                 scriptDependencies.Add(netCoreAppDependency);
-                //if (File.ReadAllText(pathToAssetsFile).Contains("\"Microsoft.AspNetCore.App\""))
                 if (HasAspNetCoreFrameworkReference(pathToAssetsFile))
                 {
                     var aspNetCoreRuntimeInfo = GetAspNetCoreRuntimeInfo(netcoreAppRuntimeAssemblyLocation);
@@ -90,33 +84,20 @@ private bool HasAspNetCoreFrameworkReference(string pathToAssetsFile)
             return assetsFile["project"]?["frameworks"]?[ScriptEnvironment.Default.TargetFramework]?["frameworkReferences"]?["Microsoft.AspNetCore.App"] != null;
         }
 
-        private static string GetPathToProjectFile(string pathToAssetsFile)
-        {
-            var pathToProjectFile = Directory.GetFiles(Path.Combine(Path.GetDirectoryName(pathToAssetsFile), ".."), "*.csproj", SearchOption.TopDirectoryOnly).SingleOrDefault();
-            if (pathToProjectFile is null)
-            {
-                pathToProjectFile = Directory.GetFiles(Path.Combine(Path.GetDirectoryName(pathToAssetsFile), "..", "..", "..", ScriptEnvironment.Default.TargetFramework), "*.csproj", SearchOption.TopDirectoryOnly).SingleOrDefault();
-            }
-
-            if (pathToProjectFile is null)
-            {
-                throw new InvalidOperationException($"Unable to locate project file based on {pathToAssetsFile}");
-            }
-
-            return pathToProjectFile;
-        }
-
         private static (string aspNetCoreRuntimeAssemblyLocation, string aspNetCoreVersion) GetAspNetCoreRuntimeInfo(string netcoreAppRuntimeAssemblyLocation)
         {
             var netCoreAppRuntimeVersion = Path.GetFileName(netcoreAppRuntimeAssemblyLocation);
             if (!SemanticVersion.TryParse(netCoreAppRuntimeVersion, out var version))
             {
-                throw new InvalidOperationException("Unable to parse version");
+                throw new InvalidOperationException($"Unable to parse netcore app version '{netCoreAppRuntimeVersion}'");
             }
             var pathToSharedFolder = Path.GetFullPath(Path.Combine(netcoreAppRuntimeAssemblyLocation, "..", ".."));
 
-            //Microsoft.AspNetCore.App
-            var pathToAspNetCoreRuntimeFolder = Directory.GetDirectories(pathToSharedFolder, "Microsoft.AspNetCore.App", SearchOption.TopDirectoryOnly).Single();
+            var pathToAspNetCoreRuntimeFolder = Directory.GetDirectories(pathToSharedFolder, "Microsoft.AspNetCore.App", SearchOption.TopDirectoryOnly).SingleOrDefault();
+            if (string.IsNullOrWhiteSpace(pathToAspNetCoreRuntimeFolder))
+            {
+                throw new InvalidOperationException($"Failed to resolve the path to 'Microsoft.AspNetCore.App' in {pathToSharedFolder}");
+            }
 
             var aspNetCoreVersionsFolders = Directory.GetDirectories(pathToAspNetCoreRuntimeFolder).Select(folder => Path.GetFileName(folder));
 
@@ -125,7 +106,7 @@ private static (string aspNetCoreRuntimeAssemblyLocation, string aspNetCoreVersi
             {
                 if (!SemanticVersion.TryParse(aspNetCoreVersionsFolder, out var aspNetCoreVersion))
                 {
-                    throw new InvalidOperationException("Unable to parse version");
+                    throw new InvalidOperationException($"Unable to parse Asp.Net version {aspNetCoreVersionsFolder}");
                 }
                 else
                 {
diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -485,11 +485,6 @@ public void ShouldCompileAndExecuteWithWebSdk()
         {
             var processResult = ScriptTestRunner.Default.ExecuteFixture("WebApi", "--no-cache");
             Assert.Equal(0, processResult.ExitCode);
-
-            // var test = ScriptTestRunner.ExecuteFixtureInProcess("WebApi", "--no-cache --debug");
-            // Assert.Equal(0, test);
-            // var (output, _) = ScriptTestRunner.Default.ExecuteFixture("CurrentContextualReflectionContext", "--isolated-load-context");
-            // Assert.Contains("Dotnet.Script.Core.ScriptAssemblyLoadContext", output);
         }
 
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -485,11 +485,6 @@ public void ShouldCompileAndExecuteWithWebSdk()`
`485`	`485`	`{`
`486`	`486`	`var processResult = ScriptTestRunner.Default.ExecuteFixture("WebApi", "--no-cache");`
`487`	`487`	`Assert.Equal(0, processResult.ExitCode);`
`488`		`-`
`489`		`- // var test = ScriptTestRunner.ExecuteFixtureInProcess("WebApi", "--no-cache --debug");`
`490`		`- // Assert.Equal(0, test);`
`491`		`- // var (output, _) = ScriptTestRunner.Default.ExecuteFixture("CurrentContextualReflectionContext", "--isolated-load-context");`
`492`		`- // Assert.Contains("Dotnet.Script.Core.ScriptAssemblyLoadContext", output);`
`493`	`488`	`}`
`494`	`489`
`495`	`490`	`[Fact]`