react to removal of PlatformAbstractions

aspnet · Apr 17, 2017 · 538c77a · 538c77a
1 parent 7939235
commit 538c77a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 15 deletions.
diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs b/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -237,8 +237,8 @@ private IServiceCollection BuildCommonServices(out AggregateException hostingSta
 
             _options = new WebHostOptions(_config);
 
-            var contentRootPath = ResolveContentRootPath(_options.ContentRootPath, appEnvironment.ApplicationBasePath);
-            var applicationName = _options.ApplicationName ?? appEnvironment.ApplicationName;
+            var contentRootPath = ResolveContentRootPath(_options.ContentRootPath, AppContext.BaseDirectory);
+            var applicationName = _options.ApplicationName;
             var hostingContext = new WebHostBuilderContext
             {
                 Configuration = _config

diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -21,7 +21,6 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Extensions.ObjectPool;
-using Microsoft.Extensions.PlatformAbstractions;
 using Xunit;
 
 [assembly: HostingStartup(typeof(WebHostBuilderTests.TestHostingStartup))]
@@ -582,49 +581,76 @@ public void DefaultContentRootIsApplicationBasePath()
                 .UseStartup("Microsoft.AspNetCore.Hosting.Tests")
                 .Build();
 
-            var appBase = PlatformServices.Default.Application.ApplicationBasePath;
+            var appBase = AppContext.BaseDirectory;
             Assert.Equal(appBase, host.Services.GetService<IHostingEnvironment>().ContentRootPath);
         }
 
         [Fact]
-        public void DefaultApplicationNameToStartupAssemblyName()
+        public void DefaultApplicationNameWithNoStartupThrows()
+        {
+            var builder = new ConfigurationBuilder();
+            var host = new WebHostBuilder()
+                .UseServer(new TestServer());
+
+            var ex = Assert.Throws<ArgumentException>(() => host.Build());
+
+            // ArgumentException adds "Parameter name" to the message and this is the cleanest way to make sure we get the right
+            // expected string
+            Assert.Equal(new ArgumentException("A valid non-empty application name must be provided.", "applicationName").Message , ex.Message);
+        }
+
+        [Fact]
+        public void DefaultApplicationNameWithUseStartupOfString()
         {
             var builder = new ConfigurationBuilder();
             var host = new WebHostBuilder()
                 .UseServer(new TestServer())
-                .UseStartup("Microsoft.AspNetCore.Hosting.Tests")
+                .UseStartup(typeof(Startup).Assembly.GetName().Name)
                 .Build();
 
             var hostingEnv = host.Services.GetService<IHostingEnvironment>();
-            Assert.Equal("Microsoft.AspNetCore.Hosting.Tests", hostingEnv.ApplicationName);
+            Assert.Equal(typeof(Startup).Assembly.GetName().Name, hostingEnv.ApplicationName);
         }
 
         [Fact]
-        public void DefaultApplicationNameToStartupType()
+        public void DefaultApplicationNameWithUseStartupOfT()
         {
             var builder = new ConfigurationBuilder();
             var host = new WebHostBuilder()
                 .UseServer(new TestServer())
                 .UseStartup<StartupNoServices>()
-                .UseStartup("Microsoft.AspNetCore.Hosting.Tests.NonExistent")
                 .Build();
 
             var hostingEnv = host.Services.GetService<IHostingEnvironment>();
-            Assert.Equal("Microsoft.AspNetCore.Hosting.Tests.NonExistent", hostingEnv.ApplicationName);
+            Assert.Equal(typeof(StartupNoServices).Assembly.GetName().Name, hostingEnv.ApplicationName);
         }
 
         [Fact]
-        public void DefaultApplicationNameAndBasePathToStartupMethods()
+        public void DefaultApplicationNameWithUseStartupOfType()
+        {
+            var builder = new ConfigurationBuilder();
+            var host = new WebHostBuilder()
+                .UseServer(new TestServer())
+                .UseStartup(typeof(StartupNoServices))
+                .Build();
+
+            var hostingEnv = host.Services.GetService<IHostingEnvironment>();
+            Assert.Equal(typeof(StartupNoServices).Assembly.GetName().Name, hostingEnv.ApplicationName);
+        }
+
+        [Fact]
+        public void DefaultApplicationNameWithConfigure()
         {
             var builder = new ConfigurationBuilder();
             var host = new WebHostBuilder()
                 .UseServer(new TestServer())
                 .Configure(app => { })
-                .UseStartup("Microsoft.AspNetCore.Hosting.Tests.NonExistent")
                 .Build();
 
             var hostingEnv = host.Services.GetService<IHostingEnvironment>();
-            Assert.Equal("Microsoft.AspNetCore.Hosting.Tests.NonExistent", hostingEnv.ApplicationName);
+
+            // Should be the assembly containing this test, because that's where the delegate comes from
+            Assert.Equal(typeof(WebHostBuilderTests).Assembly.GetName().Name, hostingEnv.ApplicationName);
         }
 
         [Fact]