From 235482b8dac49004c6b85b6ef68da3c394ee6cd8 Mon Sep 17 00:00:00 2001 From: Parallels Date: Tue, 20 Jun 2017 22:05:44 -0700 Subject: [PATCH] Fixing an issue in the RepoDirectoriesProvider where it assumed that the only directory under SDK was the SDK directories. This is no longer true now that we moved the NuGet fallback folder there. --- .../RepoDirectoriesProvider.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs index f5545b2f2..2f5e1e830 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs @@ -98,7 +98,10 @@ namespace Microsoft.DotNet.Tools.Test.Utilities _builtDotnet = builtDotnet ?? Path.Combine(_artifacts, "intermediate", "sharedFrameworkPublish"); _nugetPackages = nugetPackages ?? Path.Combine(RepoRoot, ".nuget", "packages"); _pjDotnet = pjDotnet ?? GetPjDotnetPath(); - _stage2Sdk = Directory.EnumerateDirectories(Path.Combine(_artifacts, "stage2", "sdk")).First(); + _stage2Sdk = Directory + .EnumerateDirectories(Path.Combine(_artifacts, "stage2", "sdk")) + .First(d => !d.Contains("NuGetFallbackFolder")); + _stage2WithBackwardsCompatibleRuntimesDirectory = Path.Combine(_artifacts, "stage2WithBackwardsCompatibleRuntimes"); _testPackages = Path.Combine(RepoRoot, "artifacts", "testpackages", "packages");