Merge pull request #1408 from dotnet/davidfowl/build-cleanup

More build and project clean up

scripts/Microsoft.DotNet.Cli.Build.Framework/BuildContext.cs

@@ -33,6 +33,8 @@ namespace Microsoft.DotNet.Cli.Build.Framework
             _maxTargetLen = targets.Values.Select(t => t.Name.Length).Max();
         }
 
+        public T Get<T>(string name) => (T)this[name];
+
         public BuildTargetResult RunTarget(string name) => RunTarget(name, force: false);
 
         public BuildTargetResult RunTarget(string name, bool force)

scripts/dotnet-cli-build/CompileTargets.cs

@@ -1,9 +1,9 @@
-using Microsoft.DotNet.Cli.Build.Framework;
+using System;
-using Microsoft.Extensions.PlatformAbstractions;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
+using Microsoft.DotNet.Cli.Build.Framework;
+using Microsoft.Extensions.PlatformAbstractions;
 
 using static Microsoft.DotNet.Cli.Build.FS;
 using static Microsoft.DotNet.Cli.Build.Framework.BuildHelpers;
@@ -63,7 +63,7 @@ namespace Microsoft.DotNet.Cli.Build
             Rmdir(cmakeOut);
             Mkdirp(cmakeOut);
 
-            var configuration = (string)c.BuildContext["Configuration"];
+            var configuration = c.BuildContext.Get<string>("Configuration");
 
             // Run the build
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -120,13 +120,14 @@ namespace Microsoft.DotNet.Cli.Build
         [Target]
         public static BuildTargetResult CompileStage2(BuildTargetContext c)
         {
-            var configuration = (string)c.BuildContext["Configuration"];
+            var configuration = c.BuildContext.Get<string>("Configuration");
 
             CleanBinObj(c, Path.Combine(c.BuildContext.BuildDirectory, "src"));
             CleanBinObj(c, Path.Combine(c.BuildContext.BuildDirectory, "test"));
             var result = CompileStage(c,
                 dotnet: DotNetCli.Stage1,
                 outputDir: Dirs.Stage2);
+
             if (!result.Success)
             {
                 return result;
@@ -158,9 +159,7 @@ namespace Microsoft.DotNet.Cli.Build
         {
             Rmdir(outputDir);
 
-            dotnet.SetDotNetHome();
+            var configuration = c.BuildContext.Get<string>("Configuration");
-
-            var configuration = (string)c.BuildContext["Configuration"];
             var binDir = Path.Combine(outputDir, "bin");
             var runtimeOutputDir = Path.Combine(outputDir, "runtime", "coreclr");
 
@@ -240,7 +239,7 @@ namespace Microsoft.DotNet.Cli.Build
             }
 
             // Generate .version file
-            var version = ((BuildVersion)c.BuildContext["BuildVersion"]).SimpleVersion;
+            var version = c.BuildContext.Get<BuildVersion>("BuildVersion").SimpleVersion;
             var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}";
             File.WriteAllText(Path.Combine(outputDir, ".version"), content);
 

scripts/dotnet-cli-build/PrepareTargets.cs

@@ -29,6 +29,7 @@ namespace Microsoft.DotNet.Cli.Build
             {
                 configEnv = "Debug";
             }
+
             c.BuildContext["Configuration"] = configEnv;
 
             c.Info($"Building {c.BuildContext["Configuration"]} to: {Dirs.Output}");

scripts/dotnet-cli-build/PublishTargets.cs

@@ -1,9 +1,9 @@
-using Microsoft.DotNet.Cli.Build.Framework;
+using System;
-using Microsoft.Extensions.PlatformAbstractions;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
+using Microsoft.DotNet.Cli.Build.Framework;
+using Microsoft.Extensions.PlatformAbstractions;
 
 using static Microsoft.DotNet.Cli.Build.Framework.BuildHelpers;
 
@@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Cli.Build
 
             // Set up the environment variables previously defined by common.sh/ps1
             // This is overkill, but I want to cover all the variables used in all OSes (including where some have the same names)
-            var buildVersion = (BuildVersion)c.BuildContext["BuildVersion"];
+            var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion");
             var env = new Dictionary<string, string>()
             {
                 { "RID", PlatformServices.Default.Runtime.GetRuntimeIdentifier() },

scripts/dotnet-cli-build/TestTargets.cs

@@ -1,13 +1,13 @@
-using Microsoft.DotNet.Cli.Build.Framework;
+using System;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using Microsoft.DotNet.Cli.Build.Framework;
 
 using static Microsoft.DotNet.Cli.Build.FS;
-using static Microsoft.DotNet.Cli.Build.Utils;
 using static Microsoft.DotNet.Cli.Build.Framework.BuildHelpers;
+using static Microsoft.DotNet.Cli.Build.Utils;
 
 namespace Microsoft.DotNet.Cli.Build
 {
@@ -65,7 +65,7 @@ namespace Microsoft.DotNet.Cli.Build
             foreach (var relativePath in TestPackageProjects)
             {
                 var fullPath = Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "TestPackages", relativePath.Replace('/', Path.DirectorySeparatorChar));
-                c.Info("Packing: {fullPath}");
+                c.Info($"Packing: {fullPath}");
                 dotnet.Pack("--output", Dirs.TestPackages)
                     .WorkingDirectory(fullPath)
                     .Execute()
@@ -95,7 +95,7 @@ namespace Microsoft.DotNet.Cli.Build
             var dotnet = DotNetCli.Stage2;
             foreach (var testProject in TestProjects)
             {
-                c.Info("Building tests: {project}");
+                c.Info($"Building tests: {testProject}");
                 dotnet.Build()
                     .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "test", testProject))
                     .Execute()
@@ -180,7 +180,7 @@ namespace Microsoft.DotNet.Cli.Build
         [Target]
         public static BuildTargetResult ValidateDependencies(BuildTargetContext c)
         {
-            var configuration = (string)c.BuildContext["Configuration"];
+            var configuration = c.BuildContext.Get<string>("Configuration");
             var dotnet = DotNetCli.Stage2;
 
             c.Info("Publishing MultiProjectValidator");

scripts/dotnet-cli-build/Utils/DotNetCli.cs

@@ -20,11 +20,6 @@ namespace Microsoft.DotNet.Cli.Build
             BinPath = binPath;
         }
 
-        public void SetDotNetHome()
-        {
-            Environment.SetEnvironmentVariable("DOTNET_HOME", Path.GetDirectoryName(BinPath));
-        }
-
         public Command Exec(string command, params string[] args)
         {
             return Command.Create(Path.Combine(BinPath, $"dotnet{Constants.ExeSuffix}"), Enumerable.Concat(new[] { command }, args));

src/Microsoft.DotNet.Cli.Utils/project.json

@@ -9,13 +9,18 @@
         "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537"
     },
     "frameworks": {
-        "net451": {},
+        "net451": {
+            "frameworkAssemblies": {
+                "System.Runtime": {
+                    "type": "build"
+                }
+            }
+        },
         "dnxcore50": {
             "imports": "portable-net45+win8",
             "dependencies": {
                 "NETStandard.Library": "1.0.0-rc2-23811"
             }
         }
-    },
+    }
-    "scripts": {}
 }

src/Microsoft.DotNet.Compiler.Common/project.json

@@ -1,23 +1,20 @@
 {
     "version": "1.0.0-*",
-
     "compilationOptions": {
         "keyFile": "../../tools/Key.snk"
     },
-
     "dependencies": {
         "NETStandard.Library": "1.0.0-rc2-23811",
         "System.CommandLine": "0.1.0-e160119-1",
         "Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160202-02",
         "Microsoft.DotNet.ProjectModel": "1.0.0-*",
         "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-        "Microsoft.DotNet.Files": {"version": "1.0.0-*", "target": "project"}
+        "Microsoft.DotNet.Files": "1.0.0-*"
     },
     "frameworks": {
         "dnxcore50": {
             "imports": "portable-net45+win8"
         }
     },
-    "scripts": {
+    "scripts": {}
-    }
 }

src/Microsoft.DotNet.Files/project.json

@@ -7,25 +7,14 @@
     "dependencies": {
         "NETStandard.Library": "1.0.0-rc2-23811",
         "System.Linq.Expressions": "4.0.11-rc2-23811",
-
         "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996",
-
+        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-    "Microsoft.DotNet.Cli.Utils": {
+        "Microsoft.DotNet.ProjectModel": "1.0.0-*"
-      "type": "build",
-      "version": "1.0.0-*"
     },
-
-    "Microsoft.DotNet.ProjectModel": {
-      "type": "build",
-      "version": "1.0.0-*"
-    }
-  },
-
     "frameworks": {
         "dnxcore50": {
             "imports": "portable-net45+win8"
         }
     },
-  "scripts": {
+    "scripts": {}
-  }
 }

src/Microsoft.DotNet.ProjectModel/project.json

@@ -6,7 +6,6 @@
     "description": "Types to model a .NET Project",
     "dependencies": {
         "System.Reflection.Metadata": "1.2.0-rc3-23811",
-
         "NuGet.Packaging": "3.4.0-beta-583",
         "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996",
         "Microsoft.Extensions.JsonParser.Sources": {
@@ -17,15 +16,20 @@
             "type": "build",
             "version": "1.0.0-rc2-16054"
         },
-        "Microsoft.Extensions.DependencyModel": {
+        "Microsoft.Extensions.DependencyModel": "1.0.0-*"
-            "type": "build",
-            "version": "1.0.0-*"
-        }
     },
     "frameworks": {
         "net451": {
             "frameworkAssemblies": {
-        "System.IO": ""
+                "System.Runtime": {
+                    "type": "build"
+                },
+                "System.Collections": {
+                    "type": "build"
+                },
+                "System.IO": {
+                    "type": "build"
+                }
             }
         },
         "dnxcore50": {
@@ -39,7 +43,5 @@
                 "System.Xml.XDocument": "4.0.11-rc2-23811"
             }
         }
-    },
-    "scripts": {
     }
 }

src/Microsoft.DotNet.Runtime/project.json

@@ -3,11 +3,9 @@
     "compilationOptions": {
         "emitEntryPoint": true
     },
-
     "dependencies": {
         "NETStandard.Library": "1.0.0-rc2-23811"
     },
-
     "frameworks": {
         "dnxcore50": {
             "imports": "portable-net45+win8"

src/Microsoft.Extensions.DependencyModel/project.json

@@ -37,6 +37,5 @@
             }
         }
     },
-  "scripts": {
+    "scripts": {}
-  }
 }