Tools: Default DOTNET_ENVIRONMENT to Development

Fixes #19903
dotnet · Jul 27, 2020 · 42682b5 · 42682b5
1 parent 9046e12
commit 42682b5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/EFCore.Design/Design/Internal/AppServiceProviderFactory.cs b/src/EFCore.Design/Design/Internal/AppServiceProviderFactory.cs
@@ -59,13 +59,19 @@ private IServiceProvider CreateFromHosting(string[] args)
                 return null;
             }
 
-            // TODO: Remove when dotnet/cli#6617 is fixed
-            var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
-            if (environment == null)
+            var aspnetCoreEnvironment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
+            var dotnetEnvironment = Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT");
+            var environment = aspnetCoreEnvironment
+                ?? dotnetEnvironment
+                ?? "Development";
+            if (aspnetCoreEnvironment == null)
             {
-                environment = "Development";
                 Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", environment);
             }
+            if (dotnetEnvironment == null)
+            {
+                Environment.SetEnvironmentVariable("DOTNET_ENVIRONMENT", environment);
+            }
 
             _reporter.WriteVerbose(DesignStrings.UsingEnvironment(environment));
 

diff --git a/test/EFCore.Design.Tests/Design/Internal/AppServiceProviderFactoryTest.cs b/test/EFCore.Design.Tests/Design/Internal/AppServiceProviderFactoryTest.cs
@@ -19,6 +19,7 @@ public void Create_works()
                 MockAssembly.Create(typeof(Program)));
 
             Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", null);
+            Environment.SetEnvironmentVariable("DOTNET_ENVIRONMENT", null);
             var services = factory.Create(new[] { "arg1" });
 
             Assert.NotNull(services.GetRequiredService<TestService>());
@@ -29,6 +30,7 @@ private class Program
             public static TestWebHost BuildWebHost(string[] args)
             {
                 Assert.Equal("Development", Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"));
+                Assert.Equal("Development", Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT"));
                 Assert.Equal(args, new[] { "arg1" });
 
                 return new TestWebHost(