From 8e39bf4ffbee7365bb1d28436c5c98a66eb776d7 Mon Sep 17 00:00:00 2001
From: Hisham Abdullah Bin Ateya <hishamco_2007@hotmail.com>
Date: Mon, 18 May 2015 08:01:00 +0300
Subject: [PATCH] Shift 'Development' & 'Production' constants into
 'EnvironmentName' class

Make 'EnvironmentName' static

Change constants -> static readonly fields

Remove trailing spaces
---
 .../EnvironmentName.cs                                | 11 +++++++++++
 .../HostingEnvironmentExtensions.cs                   |  7 ++-----
 src/Microsoft.AspNet.Hosting/HostingEnvironment.cs    |  4 +---
 .../HostingEngineTests.cs                             |  4 ++--
 4 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 src/Microsoft.AspNet.Hosting.Abstractions/EnvironmentName.cs

diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/EnvironmentName.cs b/src/Microsoft.AspNet.Hosting.Abstractions/EnvironmentName.cs
new file mode 100644
index 0000000000..664744383c
--- /dev/null
+++ b/src/Microsoft.AspNet.Hosting.Abstractions/EnvironmentName.cs
@@ -0,0 +1,11 @@
+// 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.
+
+namespace Microsoft.AspNet.Hosting
+{
+    public static class EnvironmentName
+    {
+        public static readonly string Development = "Development";
+        public static readonly string Production = "Production";
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/HostingEnvironmentExtensions.cs b/src/Microsoft.AspNet.Hosting.Abstractions/HostingEnvironmentExtensions.cs
index d0baeb570f..8fc1b8e43b 100644
--- a/src/Microsoft.AspNet.Hosting.Abstractions/HostingEnvironmentExtensions.cs
+++ b/src/Microsoft.AspNet.Hosting.Abstractions/HostingEnvironmentExtensions.cs
@@ -9,9 +9,6 @@ namespace Microsoft.AspNet.Hosting
 {
     public static class HostingEnvironmentExtensions
     {
-        private const string DevelopmentEnvironmentName = "Development";
-        private const string ProductionEnvironmentName = "Production";
-
         /// <summary>
         /// Checks if the current hosting environment name is development.
         /// </summary>
@@ -19,7 +16,7 @@ namespace Microsoft.AspNet.Hosting
         /// <returns>True if the environment name is Development, otherwise false.</returns>
         public static bool IsDevelopment([NotNull]this IHostingEnvironment hostingEnvironment)
         {
-            return hostingEnvironment.IsEnvironment(DevelopmentEnvironmentName);
+            return hostingEnvironment.IsEnvironment(EnvironmentName.Development);
         }
 
         /// <summary>
@@ -29,7 +26,7 @@ namespace Microsoft.AspNet.Hosting
         /// <returns>True if the environment name is Production, otherwise false.</returns>
         public static bool IsProduction([NotNull]this IHostingEnvironment hostingEnvironment)
         {
-            return hostingEnvironment.IsEnvironment(ProductionEnvironmentName);
+            return hostingEnvironment.IsEnvironment(EnvironmentName.Production);
         }
 
         /// <summary>
diff --git a/src/Microsoft.AspNet.Hosting/HostingEnvironment.cs b/src/Microsoft.AspNet.Hosting/HostingEnvironment.cs
index 323f0c0270..57617c2893 100644
--- a/src/Microsoft.AspNet.Hosting/HostingEnvironment.cs
+++ b/src/Microsoft.AspNet.Hosting/HostingEnvironment.cs
@@ -8,9 +8,7 @@ namespace Microsoft.AspNet.Hosting
 {
     public class HostingEnvironment : IHostingEnvironment
     {
-        internal const string DefaultEnvironmentName = "Production";
-
-        public string EnvironmentName { get; set; } = DefaultEnvironmentName;
+        public string EnvironmentName { get; set; } = Microsoft.AspNet.Hosting.EnvironmentName.Production;
 
         public string WebRootPath { get; set; }
 
diff --git a/test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs b/test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs
index 579febdd8f..1642ec7235 100644
--- a/test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs
+++ b/test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs
@@ -146,7 +146,7 @@ namespace Microsoft.AspNet.Hosting
         {
             var engine = CreateBuilder().Build();
             var env = engine.ApplicationServices.GetRequiredService<IHostingEnvironment>();
-            Assert.Equal("Production", env.EnvironmentName);
+            Assert.Equal(EnvironmentName.Production, env.EnvironmentName);
         }
 
         [Fact]
@@ -199,7 +199,7 @@ namespace Microsoft.AspNet.Hosting
             using (engine.Start())
             {
                 var env = engine.ApplicationServices.GetRequiredService<IHostingEnvironment>();
-                Assert.True(env.IsEnvironment("Production"));
+                Assert.True(env.IsEnvironment(EnvironmentName.Production));
                 Assert.True(env.IsEnvironment("producTion"));
             }
         }