Build and project cleanup

This commit is contained in:
David Fowler 2016-02-15 09:42:17 -08:00
parent b1cba2156b
commit 078d6a8d5f
12 changed files with 151 additions and 147 deletions

View file

@ -127,6 +127,7 @@ namespace Microsoft.DotNet.Cli.Build
var result = CompileStage(c, var result = CompileStage(c,
dotnet: DotNetCli.Stage1, dotnet: DotNetCli.Stage1,
outputDir: Dirs.Stage2); outputDir: Dirs.Stage2);
if (!result.Success) if (!result.Success)
{ {
return result; return result;

View file

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

View file

@ -65,7 +65,7 @@ namespace Microsoft.DotNet.Cli.Build
foreach (var relativePath in TestPackageProjects) foreach (var relativePath in TestPackageProjects)
{ {
var fullPath = Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "TestPackages", relativePath.Replace('/', Path.DirectorySeparatorChar)); 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) dotnet.Pack("--output", Dirs.TestPackages)
.WorkingDirectory(fullPath) .WorkingDirectory(fullPath)
.Execute() .Execute()
@ -95,7 +95,7 @@ namespace Microsoft.DotNet.Cli.Build
var dotnet = DotNetCli.Stage2; var dotnet = DotNetCli.Stage2;
foreach (var testProject in TestProjects) foreach (var testProject in TestProjects)
{ {
c.Info("Building tests: {project}"); c.Info($"Building tests: {testProject}");
dotnet.Build() dotnet.Build()
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "test", testProject)) .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "test", testProject))
.Execute() .Execute()

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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