mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

code review feedback and clean-up

Browse source
This commit is contained in:
Andrew Stanton-Nurse 2015-10-07 14:39:36 -07:00
parent 78858b0edb
commit 6395ffbff5
9 changed files with 73 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
Microsoft.DotNet.Cli.sln
View file

@ -13,6 +13,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
NuGet.Config = NuGet.Config NuGet.Config = NuGet.Config
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Cli.Utils", "src\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.xproj", "{61B7C351-C77D-43F7-B56F-BB1440178E10}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Compiler", "src\Microsoft.DotNet.Tools.Compiler\Microsoft.DotNet.Tools.Compiler.xproj", "{0A309227-A9D8-4DDF-88DD-326B57B04378}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.DependencyResolver", "src\Microsoft.DotNet.Tools.DependencyResolver\Microsoft.DotNet.Tools.DependencyResolver.xproj", "{4298DF4A-E04C-4ED9-95F8-FBB7CB32721F}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Publish", "src\Microsoft.DotNet.Tools.Publish\Microsoft.DotNet.Tools.Publish.xproj", "{391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Run", "src\Microsoft.DotNet.Tools.Run\Microsoft.DotNet.Tools.Run.xproj", "{8B23B5EC-6740-447C-92D9-1F10692F232D}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.SourceResolver", "src\Microsoft.DotNet.Tools.SourceResolver\Microsoft.DotNet.Tools.SourceResolver.xproj", "{7108E4FB-E2F1-4682-8464-1DD6EFB17035}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{13F8C30C-1011-459C-82B2-0ACDD73EDA18}"
ProjectSection(SolutionItems) = preProject
scripts\dotnet = scripts\dotnet
scripts\dotnet-compile = scripts\dotnet-compile
scripts\dotnet-compile.cmd = scripts\dotnet-compile.cmd
scripts\dotnet-publish = scripts\dotnet-publish
scripts\dotnet-publish.cmd = scripts\dotnet-publish.cmd
scripts\dotnet-resolve-references = scripts\dotnet-resolve-references
scripts\dotnet-resolve-references.cmd = scripts\dotnet-resolve-references.cmd
scripts\dotnet-resolve-sources = scripts\dotnet-resolve-sources
scripts\dotnet-resolve-sources.cmd = scripts\dotnet-resolve-sources.cmd
scripts\dotnet-restore = scripts\dotnet-restore
scripts\dotnet-restore.cmd = scripts\dotnet-restore.cmd
scripts\dotnet-run = scripts\dotnet-run
scripts\dotnet-run.cmd = scripts\dotnet-run.cmd
scripts\dotnet.cmd = scripts\dotnet.cmd
EndProjectSection
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -23,11 +53,41 @@ Global
{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Release|Any CPU.Build.0 = Release|Any CPU {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Release|Any CPU.Build.0 = Release|Any CPU
{61B7C351-C77D-43F7-B56F-BB1440178E10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61B7C351-C77D-43F7-B56F-BB1440178E10}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61B7C351-C77D-43F7-B56F-BB1440178E10}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61B7C351-C77D-43F7-B56F-BB1440178E10}.Release|Any CPU.Build.0 = Release|Any CPU
{0A309227-A9D8-4DDF-88DD-326B57B04378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0A309227-A9D8-4DDF-88DD-326B57B04378}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A309227-A9D8-4DDF-88DD-326B57B04378}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A309227-A9D8-4DDF-88DD-326B57B04378}.Release|Any CPU.Build.0 = Release|Any CPU
{4298DF4A-E04C-4ED9-95F8-FBB7CB32721F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4298DF4A-E04C-4ED9-95F8-FBB7CB32721F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4298DF4A-E04C-4ED9-95F8-FBB7CB32721F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4298DF4A-E04C-4ED9-95F8-FBB7CB32721F}.Release|Any CPU.Build.0 = Release|Any CPU
{391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Release|Any CPU.Build.0 = Release|Any CPU
{8B23B5EC-6740-447C-92D9-1F10692F232D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8B23B5EC-6740-447C-92D9-1F10692F232D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8B23B5EC-6740-447C-92D9-1F10692F232D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8B23B5EC-6740-447C-92D9-1F10692F232D}.Release|Any CPU.Build.0 = Release|Any CPU
{7108E4FB-E2F1-4682-8464-1DD6EFB17035}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7108E4FB-E2F1-4682-8464-1DD6EFB17035}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7108E4FB-E2F1-4682-8464-1DD6EFB17035}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7108E4FB-E2F1-4682-8464-1DD6EFB17035}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
{61B7C351-C77D-43F7-B56F-BB1440178E10} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
{0A309227-A9D8-4DDF-88DD-326B57B04378} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
{4298DF4A-E04C-4ED9-95F8-FBB7CB32721F} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
{391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
{8B23B5EC-6740-447C-92D9-1F10692F232D} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
{7108E4FB-E2F1-4682-8464-1DD6EFB17035} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

44
dotnet-cli.sln
View file

@ -1,44 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1F391100-F011-4630-8C25-D1A5355E4F19}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5AB144A3-3D0A-4DC7-9EE8-19FDD2DF8735}"
ProjectSection(SolutionItems) = preProject
dotnet-compile.cmd = dotnet-compile.cmd
dotnet-run.cmd = dotnet-run.cmd
global.json = global.json
NuGet.Config = NuGet.Config
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{47858134-8A8D-4D5C-ABD5-E6630A66DA05}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestApp", "test\TestApp\TestApp.xproj", "{58808BBC-371E-47D6-A3D0-4902145EDA4E}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DotNet.Tools.DependencyResolver", "src\DotNet.Tools.DependencyResolver\DotNet.Tools.DependencyResolver.xproj", "{A5D41198-209A-461B-A191-F48B9DBECD67}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{58808BBC-371E-47D6-A3D0-4902145EDA4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{58808BBC-371E-47D6-A3D0-4902145EDA4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58808BBC-371E-47D6-A3D0-4902145EDA4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58808BBC-371E-47D6-A3D0-4902145EDA4E}.Release|Any CPU.Build.0 = Release|Any CPU
{A5D41198-209A-461B-A191-F48B9DBECD67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A5D41198-209A-461B-A191-F48B9DBECD67}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A5D41198-209A-461B-A191-F48B9DBECD67}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A5D41198-209A-461B-A191-F48B9DBECD67}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{58808BBC-371E-47D6-A3D0-4902145EDA4E} = {47858134-8A8D-4D5C-ABD5-E6630A66DA05}
{A5D41198-209A-461B-A191-F48B9DBECD67} = {1F391100-F011-4630-8C25-D1A5355E4F19}
EndGlobalSection
EndGlobal

7
src/Microsoft.DotNet.Tools.Compiler/Program.cs
View file

@ -1,7 +1,6 @@
using System; using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection;
using Microsoft.Dnx.Runtime.Common.CommandLine; using Microsoft.Dnx.Runtime.Common.CommandLine;
using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Utils;
@ -110,10 +109,10 @@ namespace Microsoft.DotNet.Tools.Compiler
// Build csc args // Build csc args
var cscArgs = new[] var cscArgs = new[]
{ {
"/nostdlib", "-nostdlib",
$"/out:{Path.Combine(outputPath, projectDir.Name + ".dll")}" $"-out:{Path.Combine(outputPath, projectDir.Name + ".dll")}"
} }
.Concat(references.Select(r => $"/r:{r}")) .Concat(references.Select(r => $"-r:{r}"))
.Concat(sources); .Concat(sources);
var rsp = Path.Combine(outputPath, "csc.rsp"); var rsp = Path.Combine(outputPath, "csc.rsp");
if(File.Exists(rsp)) if(File.Exists(rsp))

5
src/Microsoft.DotNet.Tools.DependencyResolver/Program.cs
View file

@ -4,15 +4,16 @@ using System.Linq;
using Microsoft.Dnx.Runtime.Common.CommandLine; using Microsoft.Dnx.Runtime.Common.CommandLine;
using NuGet.Frameworks; using NuGet.Frameworks;
namespace DotNet.Tools.DependencyResolver namespace Microsoft.DotNet.Tools.DependencyResolver
{ {
public class Program public class Program
{ {
public void Main(string[] args) public void Main(string[] args)
{ {
var app = new CommandLineApplication(); var app = new CommandLineApplication();
app.HelpOption("-h|--help"); app.Name = "dotnet resolve-references";
app.Description = "Resolves the absolute path of all dependencies for a project"; app.Description = "Resolves the absolute path of all dependencies for a project";
app.HelpOption("-h|--help");
var packages = app.Option("-p|--packages <PACKAGES_DIRECTORY>", "Path to the directories containing packages to resolve.", CommandOptionType.MultipleValue); var packages = app.Option("-p|--packages <PACKAGES_DIRECTORY>", "Path to the directories containing packages to resolve.", CommandOptionType.MultipleValue);
var framework = app.Option("-f|--framework <FRAMEWORK_NAME>", "The framework to resolve dependencies for.", CommandOptionType.SingleValue); var framework = app.Option("-f|--framework <FRAMEWORK_NAME>", "The framework to resolve dependencies for.", CommandOptionType.SingleValue);

3
src/Microsoft.DotNet.Tools.DependencyResolver/Resolver.cs
View file

@ -1,10 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Threading.Tasks;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
namespace DotNet.Tools.DependencyResolver namespace Microsoft.DotNet.Tools.DependencyResolver
{ {
public static class Resolver public static class Resolver
{ {

4
src/Microsoft.DotNet.Tools.Publish/Program.cs
View file

@ -1,11 +1,9 @@
using System; using System;
using System.IO; using System.IO;
using System.Linq;
using System.Reflection;
using Microsoft.Dnx.Runtime.Common.CommandLine; using Microsoft.Dnx.Runtime.Common.CommandLine;
using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Compiler namespace Microsoft.DotNet.Tools.Publish
{ {
public class Program public class Program
{ {

4
src/Microsoft.DotNet.Tools.Run/Program.cs
View file

@ -1,12 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Reflection;
using Microsoft.Dnx.Runtime.Common.CommandLine; using Microsoft.Dnx.Runtime.Common.CommandLine;
using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Compiler namespace Microsoft.DotNet.Tools.Run
{ {
public class Program public class Program
{ {

5
src/Microsoft.DotNet.Tools.SourceResolver/Program.cs
View file

@ -2,15 +2,16 @@
using System.IO; using System.IO;
using Microsoft.Dnx.Runtime.Common.CommandLine; using Microsoft.Dnx.Runtime.Common.CommandLine;
namespace DotNet.Tools.DependencyResolver namespace Microsoft.DotNet.Tools.SourceResolver
{ {
public class Program public class Program
{ {
public void Main(string[] args) public void Main(string[] args)
{ {
var app = new CommandLineApplication(); var app = new CommandLineApplication();
app.HelpOption("-h|--help"); app.Name = "dotnet resolve-sources";
app.Description = "Resolves the absolute path of all source files used by a project"; app.Description = "Resolves the absolute path of all source files used by a project";
app.HelpOption("-h|--help");
var output = app.Option("-o|--output <OUTPUT_FILE>", "The path in which to write the output file (formatted as text with one line per dependency)", CommandOptionType.SingleValue); var output = app.Option("-o|--output <OUTPUT_FILE>", "The path in which to write the output file (formatted as text with one line per dependency)", CommandOptionType.SingleValue);
var project = app.Argument("PROJECT", "The project to resolve. A directory or a path to a project.json may be used. Defaults to the current directory"); var project = app.Argument("PROJECT", "The project to resolve. A directory or a path to a project.json may be used. Defaults to the current directory");

4
src/Microsoft.DotNet.Tools.SourceResolver/Resolver.cs
View file

@ -1,11 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Threading.Tasks;
using Microsoft.Dnx.Runtime; using Microsoft.Dnx.Runtime;
using Newtonsoft.Json.Linq;
namespace DotNet.Tools.DependencyResolver namespace Microsoft.DotNet.Tools.SourceResolver
{ {
public static class Resolver public static class Resolver
{ {