Merge branch 'master' of github.com:dotnet/roslyn into 4578-wildcard-…

…deterministic
dotnet · Sep 23, 2015 · dff44c3 · dff44c3
2 parents c70c4fe + fdd298c
commit dff44c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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)
         {
         }