Merge pull request dotnet-script#274 from atifaziz/script-env-singleton-laziness

seesharper · web-flow · commit ccd2b51f54d7 · 2018-05-01T21:58:24.000+02:00
ScriptEnvironment.Default laziness is redundant
diff --git a/src/Dotnet.Script.DependencyModel/Environment/ScriptEnvironment.cs b/src/Dotnet.Script.DependencyModel/Environment/ScriptEnvironment.cs
@@ -8,7 +8,7 @@ namespace Dotnet.Script.DependencyModel.Environment
 {
     public class ScriptEnvironment
     {
-        private static readonly Lazy<ScriptEnvironment> _default = new Lazy<ScriptEnvironment>(() => new ScriptEnvironment());
+        public static readonly ScriptEnvironment Default = new ScriptEnvironment();
 
         private readonly Lazy<string> _targetFramework;
 
@@ -22,8 +22,6 @@ public class ScriptEnvironment
 
         private readonly Lazy<string> _nuGetStoreFolder;
 
-        public static ScriptEnvironment Default => _default.Value;
-
         private ScriptEnvironment()
         {
             _targetFramework = new Lazy<string>(GetNetCoreAppVersion);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Dotnet.Script.DependencyModel.Environment`
`8`	`8`	`{`
`9`	`9`	`public class ScriptEnvironment`
`10`	`10`	`{`
`11`		`- private static readonly Lazy<ScriptEnvironment> _default = new Lazy<ScriptEnvironment>(() => new ScriptEnvironment());`
	`11`	`+ public static readonly ScriptEnvironment Default = new ScriptEnvironment();`
`12`	`12`
`13`	`13`	`private readonly Lazy<string> _targetFramework;`
`14`	`14`
`@@ -22,8 +22,6 @@ public class ScriptEnvironment`
`22`	`22`
`23`	`23`	`private readonly Lazy<string> _nuGetStoreFolder;`
`24`	`24`
`25`		`- public static ScriptEnvironment Default => _default.Value;`
`26`		`-`
`27`	`25`	`private ScriptEnvironment()`
`28`	`26`	`{`
`29`	`27`	`_targetFramework = new Lazy<string>(GetNetCoreAppVersion);`