diff --git a/build_projects/dotnet-cli-build/TestTargets.cs b/build_projects/dotnet-cli-build/TestTargets.cs index 4cbfe8239..9fc82b06a 100644 --- a/build_projects/dotnet-cli-build/TestTargets.cs +++ b/build_projects/dotnet-cli-build/TestTargets.cs @@ -39,6 +39,7 @@ namespace Microsoft.DotNet.Cli.Build "Microsoft.DotNet.Cli.Utils.Tests", "Microsoft.DotNet.Compiler.Common.Tests", "Microsoft.DotNet.ProjectModel.Tests", + "Microsoft.DotNet.ProjectModel.Loader.Tests", "Microsoft.Extensions.DependencyModel.Tests", "Performance" }; diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/LoaderProjectContextExtensions.cs b/src/Microsoft.DotNet.ProjectModel.Loader/LoaderProjectContextExtensions.cs index 401492aae..5dec13272 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/LoaderProjectContextExtensions.cs +++ b/src/Microsoft.DotNet.ProjectModel.Loader/LoaderProjectContextExtensions.cs @@ -20,7 +20,7 @@ namespace Microsoft.DotNet.ProjectModel.Loader public static AssemblyLoadContext CreateLoadContext( this ProjectContext context, string runtimeIdentifier, - string configuration) => CreateLoadContext(context, runtimeIdentifier, configuration); + string configuration) => CreateLoadContext(context, runtimeIdentifier, configuration, outputPath: null); public static AssemblyLoadContext CreateLoadContext( this ProjectContext context, @@ -124,4 +124,4 @@ namespace Microsoft.DotNet.ProjectModel.Loader } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/ProjectLoadContextTest.cs b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/ProjectLoadContextTest.cs index 1e3c562ea..0a2a2987b 100644 --- a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/ProjectLoadContextTest.cs +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/ProjectLoadContextTest.cs @@ -13,20 +13,21 @@ namespace Microsoft.DotNet.ProjectModel.Loader.Tests [Fact] public void LoadContextCanLoadProjectOutput() { - var testInstance = TestAssetsManager.CreateTestInstance("TestProjectWithResource") + var testInstance = TestAssetsManager.CreateTestInstance("TestProjectWithCultureSpecificResource") .WithLockFiles() .WithBuildArtifacts(); - var rid = DependencyContext.Default.Target.Runtime; + var runtimeIdentifier = DependencyContext.Default.Target.Runtime; - var context = ProjectContext.Create(testInstance.TestRoot, NuGetFramework.Parse("netcoreapp1.0"), new[] { rid }); - var loadContext = context.CreateLoadContext(rid, Constants.DefaultConfiguration); + var context = ProjectContext.Create(testInstance.TestRoot, NuGetFramework.Parse("netcoreapp1.0"), new[] { runtimeIdentifier }); + var loadContext = context.CreateLoadContext(runtimeIdentifier, Constants.DefaultConfiguration); // Load the project assembly - var asm = loadContext.LoadFromAssemblyName(new AssemblyName("TestProjectWithResource")); + var assembly = loadContext.LoadFromAssemblyName(new AssemblyName("TestProjectWithCultureSpecificResource")); // Call Program.GetMessage() and assert the output - var message = (string)asm.GetType("TestProjectWithCultureSpecificResource").GetRuntimeMethod("GetMessage", Type.EmptyTypes).Invoke(null, new object[0]); + var type = assembly.GetType("TestProjectWithCultureSpecificResource.Program"); + var message = (string)type.GetRuntimeMethod("GetMessage", Type.EmptyTypes).Invoke(null, new object[0]); Assert.Equal("Hello World!" + Environment.NewLine + "Bonjour!", message); } }