From 8be3b16756f1e68cf27cb08850497ed23f7b49c1 Mon Sep 17 00:00:00 2001 From: Prafull Bhosale Date: Mon, 10 Oct 2016 14:06:34 -0700 Subject: [PATCH] Fix DotNetDependencyProviderTest for CI --- .../DotNet/DotNetDependencyProviderTests.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/test/Microsoft.Extensions.ProjectModel.Tests/DotNet/DotNetDependencyProviderTests.cs b/test/Microsoft.Extensions.ProjectModel.Tests/DotNet/DotNetDependencyProviderTests.cs index ccb96e4303..e5fe160a69 100644 --- a/test/Microsoft.Extensions.ProjectModel.Tests/DotNet/DotNetDependencyProviderTests.cs +++ b/test/Microsoft.Extensions.ProjectModel.Tests/DotNet/DotNetDependencyProviderTests.cs @@ -63,25 +63,21 @@ namespace Microsoft.Extensions.ProjectModel.DotNet var context = new DotNetProjectContext(oldContext, "Debug", Path.Combine(fileProvider.Root, "demo", "bin")); - var home = Environment.GetEnvironmentVariable("USERPROFILE") - ?? Environment.GetEnvironmentVariable("HOME"); - var nugetPackageRoot = Path.Combine(home, ".nuget", "packages"); - var expectedPackagePath = Path.Combine(nugetPackageRoot, "Microsoft.AspNetCore.Mvc", "1.0.0"); - var expectedReferencePath = Path.Combine(expectedPackagePath, "lib", "netstandard1.6", "Microsoft.AspNetCore.Mvc.dll"); - var assembly = context .CompilationAssemblies .Where(asm => asm.Name.Equals("Microsoft.AspNetCore.Mvc", StringComparison.OrdinalIgnoreCase)) .First(); - Assert.Equal(expectedReferencePath, assembly.ResolvedPath); + Assert.True(File.Exists(assembly.ResolvedPath)); + Assert.True(assembly.ResolvedPath.EndsWith("Microsoft.AspNetCore.Mvc.dll", StringComparison.OrdinalIgnoreCase)); var mvcPackage = context .PackageDependencies .Where(package => package.Name.Equals("Microsoft.AspNetCore.Mvc", StringComparison.OrdinalIgnoreCase)) .First(); - Assert.Equal(expectedPackagePath, mvcPackage.Path); + Assert.True(Directory.Exists(mvcPackage.Path)); + Assert.True(mvcPackage.Path.EndsWith($"Microsoft.AspNetCore.Mvc{Path.DirectorySeparatorChar}1.0.0", StringComparison.OrdinalIgnoreCase)); } } }