From e34e5dc1e24ffb1b7d4333b62c8aa3d7c0c5419b Mon Sep 17 00:00:00 2001
From: Charles Stoner <chucks@microsoft.com>
Date: Wed, 23 Sep 2015 09:40:41 -0700
Subject: [PATCH] Misc. cleanup

---
 .../Features/Interactive/Core/NuGetPackageResolverImpl.cs     | 2 +-
 src/Interactive/HostTest/NuGetPackageResolverTests.cs         | 2 +-
 .../Core/Resolvers/RuntimeMetadataReferenceResolver.cs        | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Interactive/Features/Interactive/Core/NuGetPackageResolverImpl.cs b/src/Interactive/Features/Interactive/Core/NuGetPackageResolverImpl.cs
index c87c1d5669a..805e9c7cc26 100644
--- a/src/Interactive/Features/Interactive/Core/NuGetPackageResolverImpl.cs
+++ b/src/Interactive/Features/Interactive/Core/NuGetPackageResolverImpl.cs
@@ -87,7 +87,7 @@ internal override ImmutableArray<string> ResolveNuGetPackage(string packageName,
             catch (UnauthorizedAccessException)
             {
             }
-            return default(ImmutableArray<string>);
+            return ImmutableArray<string>.Empty;
         }
 
         /// <summary>
diff --git a/src/Interactive/HostTest/NuGetPackageResolverTests.cs b/src/Interactive/HostTest/NuGetPackageResolverTests.cs
index feca034d1de..2fc46df9c15 100644
--- a/src/Interactive/HostTest/NuGetPackageResolverTests.cs
+++ b/src/Interactive/HostTest/NuGetPackageResolverTests.cs
@@ -126,7 +126,7 @@ public void HandledException()
                 bool restored = false;
                 var resolver = new NuGetPackageResolverImpl(directory.Path, startInfo => { restored = true; throw new IOException(); });
                 var actualPaths = resolver.ResolveNuGetPackage("A.B.C", "1.2");
-                Assert.True(actualPaths.IsDefault);
+                Assert.True(actualPaths.IsEmpty);
                 Assert.True(restored);
             }
         }
diff --git a/src/Scripting/Core/Resolvers/RuntimeMetadataReferenceResolver.cs b/src/Scripting/Core/Resolvers/RuntimeMetadataReferenceResolver.cs
index 8a7c45c27da..4edd31612e5 100644
--- a/src/Scripting/Core/Resolvers/RuntimeMetadataReferenceResolver.cs
+++ b/src/Scripting/Core/Resolvers/RuntimeMetadataReferenceResolver.cs
@@ -25,9 +25,7 @@ internal sealed class RuntimeMetadataReferenceResolver : MetadataReferenceResolv
         internal RuntimeMetadataReferenceResolver(
             ImmutableArray<string> searchPaths,
             string baseDirectory)
-            : this(new RelativePathResolver(searchPaths.NullToEmpty(), baseDirectory),
-                   null,
-                   GacFileResolver.Default)
+            : this(new RelativePathResolver(searchPaths, baseDirectory), null, GacFileResolver.Default)
         {
         }
 
-- 
GitLab