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

Merge pull request #1151 from dotnet/davidfowl/single-project

Browse source 
Everything in the same project
This commit is contained in:
Piotr Puszkiewicz 2016-02-01 16:55:27 -08:00
commit a344f56b1c
167 changed files with 158 additions and 828 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/build/build_appdeps.ps1
View file

@ -13,7 +13,7 @@ If (Test-Path $intermediateDir){
rmdir -Force -Rec $intermediateDir
}
mkdir $intermediateDir
& dotnet restore --packages "$intermediateDir" "$RepoRoot\src\dotnet-compile-native\appdep\project.json"
& dotnet restore --packages "$intermediateDir" "$RepoRoot\src\dotnet\commands\dotnet-compile-native\appdep\project.json"
If (Test-Path $appdepBinDir){

2
scripts/build/build_appdeps.sh
View file

@ -16,7 +16,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
source "$DIR/../common/_common.sh"
APPDEPS_PROJECT_DIR="$REPOROOT/src/dotnet-compile-native/appdep"
APPDEPS_PROJECT_DIR="$REPOROOT/src/dotnet/commands/dotnet-compile-native/appdep"
# Get Absolute Output Dir
pushd $1

19
scripts/configuration/buildProjects.csv
View file

@ -1,20 +1 @@
dotnet
dotnet-build
dotnet-compile
dotnet-compile-csc
dotnet-compile-fsc
dotnet-compile-native
dotnet-new
dotnet-pack
dotnet-projectmodel-server
dotnet-publish
dotnet-restore
dotnet-repl
dotnet-repl-csi
dotnet-resgen
dotnet-run
dotnet-test
Microsoft.DotNet.Cli.Utils
Microsoft.DotNet.ProjectModel.Loader
Microsoft.DotNet.ProjectModel.Workspaces
Microsoft.Extensions.Testing.Abstractions

1 dotnet
dotnet-build
dotnet-compile
dotnet-compile-csc
dotnet-compile-fsc
dotnet-compile-native
dotnet-new
dotnet-pack
dotnet-projectmodel-server
dotnet-publish
dotnet-restore
dotnet-repl
dotnet-repl-csi
dotnet-resgen
dotnet-run
dotnet-test
Microsoft.DotNet.Cli.Utils
Microsoft.DotNet.ProjectModel.Loader
Microsoft.DotNet.ProjectModel.Workspaces
Microsoft.Extensions.Testing.Abstractions

8
src/Microsoft.DotNet.Cli.Utils/Command.cs
View file

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using NuGet.Frameworks;
@ -39,6 +40,11 @@ namespace Microsoft.DotNet.Cli.Utils
ResolutionStrategy = commandSpec.ResolutionStrategy;
}
public static Command CreateDotNet(string commandName, IEnumerable<string> args, NuGetFramework framework = null, bool useComSpec = false)
{
return Create("dotnet", new[] { commandName }.Concat(args), framework, useComSpec);
}
/// <summary>
/// Create a command with the specified arg array. Args will be
/// escaped properly to ensure that exactly the strings in this
@ -51,7 +57,7 @@ namespace Microsoft.DotNet.Cli.Utils
/// <returns></returns>
public static Command Create(string commandName, IEnumerable<string> args, NuGetFramework framework = null, bool useComSpec = false)
{
var commandSpec = CommandResolver.TryResolveCommandSpec(commandName, args, framework, useComSpec=useComSpec);
var commandSpec = CommandResolver.TryResolveCommandSpec(commandName, args, framework, useComSpec);
if (commandSpec == null)
{

20
src/dotnet-build/dotnet-build.xproj
View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>0a309227-a9d8-4ddf-88dd-326b57b04379</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.Build</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

24
src/dotnet-build/project.json
View file

@ -1,24 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"dotnet-compile": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
}
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

26
src/dotnet-compile-csc/Properties/AssemblyInfo.cs
View file

@ -1,26 +0,0 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Microsoft.DotNet.Tools.Compiler.Csc")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Microsoft.DotNet.Tools.Compiler.Csc")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("b559378c-fc03-45fa-893c-71784f28e0a2")]

20
src/dotnet-compile-csc/dotnet-compile-csc.xproj
View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>b559378c-fc03-45fa-893c-71784f28e0a2</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.Compiler.Csc</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

26
src/dotnet-compile-csc/project.json
View file

@ -1,26 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20160108-01",
"System.Net.Sockets": "4.1.0-rc2-23727",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.DotNet.Compiler.Common": "1.0.0-*"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

20
src/dotnet-compile-fsc/dotnet-compile-fsc.xproj
View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>74f25188-bf63-4bf3-879b-b6cdb11ed608</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.Compiler.Fsc</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

25
src/dotnet-compile-fsc/project.json
View file

@ -1,25 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-151218",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.DotNet.Compiler.Common": "1.0.0-*"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

19
src/dotnet-compile-native/dotnet-compile-native.xproj
View file

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>172485dd-b94e-4f3e-851e-cf23908ff960</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.Compiler.Native</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

25
src/dotnet-compile-native/project.json
View file

@ -1,25 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.DotNet.ILCompiler": "1.0.4-*",
"Microsoft.DotNet.ILCompiler.SDK": "1.0.4-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

20
src/dotnet-compile/dotnet-compile.xproj
View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>0a309227-a9d8-4ddf-88dd-326b57b04378</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.Compiler</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

29
src/dotnet-compile/project.json
View file

@ -1,29 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16530",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.Extensions.DependencyModel": {
"type": "build",
"version": "1.0.0-*"
}
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

18
src/dotnet-new/dotnet-new.xproj
View file

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>bc765fbf-ad7a-4a99-9902-5540c5a74181</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.New</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

25
src/dotnet-new/project.json
View file

@ -1,25 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
}
},
"compileExclude": [ "CSharp_Console/**", "FSharp_Console/**" ],
"resource": [ "CSharp_Console/NuGet.Config", "CSharp_Console/Program.cs", "CSharp_Console/project.json", "FSharp_Console/NuGet.config", "FSharp_Console/Program.fs", "FSharp_Console/project.json"],
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

19
src/dotnet-pack/dotnet-pack.xproj
View file

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.23107" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.23107</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>0f480791-4ba0-44e3-8cc4-c71656664175</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.Pack</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

26
src/dotnet-pack/project.json
View file

@ -1,26 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23727",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
}
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

19
src/dotnet-projectmodel-server/dotnet-projectmodel-server.xproj
View file

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.23107" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.23107</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>1ea9af94-5494-40dd-a05b-9d564572ccfc</ProjectGuid>
<RootNamespace>Microsoft.DotNet.ProjectModel.Server</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

27
src/dotnet-projectmodel-server/project.json
View file

@ -1,27 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"System.Threading.ThreadPool": "4.0.10-rc2-23727",
"System.Runtime.Serialization.Primitives": "4.1.0-rc2-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.Extensions.Logging": "1.0.0-rc2-16011",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-16011",
"Newtonsoft.Json": "7.0.1"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

19
src/dotnet-publish/dotnet-publish.xproj
View file

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>391d6ad6-0fd5-4e1e-a4c8-6b5439d197b5</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.Publish</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

23
src/dotnet-publish/project.json
View file

@ -1,23 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
}
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

20
src/dotnet-repl-csi/dotnet-repl-csi.xproj
View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>717a4ed9-8897-492f-bd0c-230fcaea9237</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.Repl.Csi</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

24
src/dotnet-repl-csi/project.json
View file

@ -1,24 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta1-20160108-01",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
}
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

20
src/dotnet-repl/dotnet-repl.xproj
View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>b317356c-99de-499e-8b4d-d6bec5da57d5</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.Repl</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

23
src/dotnet-repl/project.json
View file

@ -1,23 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
}
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

26
src/dotnet-resgen/Properties/AssemblyInfo.cs
View file

@ -1,26 +0,0 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Microsoft.DotNet.Tools.Resgen")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Microsoft.DotNet.Tools.Resgen")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("585fc6f6-48e0-4ea5-8015-0264614e97c0")]

20
src/dotnet-resgen/dotnet-resgen.xproj
View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>585fc6f6-48e0-4ea5-8015-0264614e97c0</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.Resgen</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

26
src/dotnet-resgen/project.json
View file

@ -1,26 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"System.Xml.XDocument": "4.0.11-rc2-23727",
"System.Resources.ReaderWriter": "4.0.0-rc2-23727",
"Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160108-01",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
}
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

8
src/dotnet-restore/Properties/AssemblyInfo.cs
View file

@ -1,8 +0,0 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Reflection;
using System.Resources;
[assembly: AssemblyMetadata("Serviceable", "True")]
[assembly: NeutralResourcesLanguage("en-us")]

17
src/dotnet-restore/dotnet-restore.xproj
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>79620410-4ec7-4a38-a8c3-ee81243f818e</ProjectGuid>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

38
src/dotnet-restore/project.json
View file

@ -1,38 +0,0 @@
{
"description": "Restore packages specified in project.json (project file)",
"version": "1.0.0-*",
"repository": {
"type": "git",
"url": "git://github.com/dotnet/cli"
},
"compilationOptions": {
"warningsAsErrors": true,
"emitEntryPoint": true
},
"dependencies": {
"NuGet.CommandLine.XPlat": "3.4.0-beta-559",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23727",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23727",
"NETStandard.Library": "1.0.0-rc2-23727",
"System.Linq.Expressions": "4.0.11-rc2-23727",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.Dnx.Runtime.CommandParsing.Sources": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.Extensions.CommandLineUtils.Sources": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.Extensions.Logging": "1.0.0-rc2-16010",
"Newtonsoft.Json": "7.0.1"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

19
src/dotnet-run/dotnet-run.xproj
View file

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>1c16108c-c786-482d-bb0a-36bdafe109ed</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.Run</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

23
src/dotnet-run/project.json
View file

@ -1,23 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20160108-01",
"System.Net.Sockets": "4.1.0-rc2-23727",
"System.CommandLine" : "0.1.0-e160119-1",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
},
"scripts": {
}
}

8
src/dotnet-test/Properties/AssemblyInfo.cs
View file

@ -1,8 +0,0 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Reflection;
using System.Resources;
[assembly: AssemblyMetadata("Serviceable", "True")]
[assembly: NeutralResourcesLanguage("en-us")]

41
src/dotnet-test/project.json
View file

@ -1,41 +0,0 @@
{
"description": "Test host for discovering and running unit tests at design time, such as in Visual Studio.",
"version": "1.0.0-*",
"repository": {
"type": "git",
"url": "git://github.com/dotnet/cli"
},
"compilationOptions": {
"warningsAsErrors": true,
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23727",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23727",
"System.Diagnostics.TraceSource": "4.0.0-rc2-23727",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23727",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23727",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Dnx.Runtime.CommandParsing.Sources": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.Dnx.Runtime.Sources": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.Extensions.Testing.Abstractions": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.Extensions.CommandLineUtils.Sources": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.Extensions.Logging": "1.0.0-rc2-16011",
"Newtonsoft.Json": "7.0.1"
},
"frameworks": {
"dnxcore50": { }
}
}

42
src/dotnet/Program.cs
View file

@ -6,8 +6,20 @@ using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.ProjectModel.Server;
using Microsoft.DotNet.Tools.Build;
using Microsoft.DotNet.Tools.Compiler;
using Microsoft.DotNet.Tools.Compiler.Csc;
using Microsoft.DotNet.Tools.Compiler.Fsc;
using Microsoft.DotNet.Tools.Compiler.Native;
using Microsoft.DotNet.Tools.New;
using Microsoft.DotNet.Tools.Publish;
using Microsoft.Extensions.PlatformAbstractions;
using Microsoft.DotNet.Tools.Restore;
using NuGet.Frameworks;
using Microsoft.DotNet.Tools.Resgen;
using Microsoft.DotNet.Tools.Run;
using Microsoft.DotNet.Tools.Test;
namespace Microsoft.DotNet.Cli
{
@ -54,7 +66,7 @@ Common Commands:
return 1;
}
}
private static int ProcessArgs(string[] args)
@ -71,7 +83,7 @@ Common Commands:
{
verbose = true;
}
else if(IsArg(args[lastArg], "version"))
else if (IsArg(args[lastArg], "version"))
{
PrintVersionInfo();
return 0;
@ -106,6 +118,32 @@ Common Commands:
return RunHelpCommand(appArgs);
}
var builtIns = new Dictionary<string, Func<string[], int>>
{
["build"] = BuildCommand.Run,
["compile"] = CommpileCommand.Run,
["compile-csc"] = CompileCscCommand.Run,
["compile-fsc"] = CompileFscCommand.Run,
["compile-native"] = CompileNativeCommand.Run,
["new"] = NewCommand.Run,
["pack"] = PackCommand.Run,
["projectmodel-server"] = ProjectModelServerCommand.Run,
["publish"] = PublishCommand.Run,
["restore"] = RestoreCommand.Run,
["resgen"] = ResgenCommand.Run,
["run"] = RunCommand.Run,
["test"] = TestCommand.Run
};
Func<string[], int> builtIn;
if (builtIns.TryGetValue(command, out builtIn))
{
// mimic the env variable
Environment.SetEnvironmentVariable(CommandContext.Variables.Verbose, verbose.ToString());
Environment.SetEnvironmentVariable(CommandContext.Variables.AnsiPassThru, bool.TrueString);
return builtIn(appArgs.ToArray());
}
return Command.Create("dotnet-" + command, appArgs, FrameworkConstants.CommonFrameworks.DnxCore50)
.EnvironmentVariable(CommandContext.Variables.Verbose, verbose.ToString())
.EnvironmentVariable(CommandContext.Variables.AnsiPassThru, bool.TrueString)

0
src/dotnet-build/BuilderCommandApp.cs → src/dotnet/commands/dotnet-build/BuilderCommandApp.cs
View file

6
src/dotnet-build/CompileContext.cs → src/dotnet/commands/dotnet-build/CompileContext.cs
View file

@ -235,7 +235,7 @@ namespace Microsoft.DotNet.Tools.Build
private void CollectCheckPathProbingPreconditions(ProjectContext project, IncrementalPreconditions preconditions)
{
var pathCommands = CompilerUtil.GetCommandsInvokedByCompile(project)
.Select(commandName => Command.Create(commandName, Enumerable.Empty<string>(), project.TargetFramework))
.Select(commandName => Command.CreateDotNet(commandName, Enumerable.Empty<string>(), project.TargetFramework))
.Where(c => c.ResolutionStrategy.Equals(CommandResolutionStrategy.Path));
foreach (var pathCommand in pathCommands)
@ -281,7 +281,7 @@ namespace Microsoft.DotNet.Tools.Build
args.Add(_args.ConfigValue);
args.Add(projectDependency.Project.ProjectDirectory);
var compileResult = Command.Create("dotnet-compile", args)
var compileResult = Command.CreateDotNet("compile", args)
.ForwardStdOut()
.ForwardStdErr()
.Execute();
@ -339,7 +339,7 @@ namespace Microsoft.DotNet.Tools.Build
args.Add(_rootProject.ProjectDirectory);
var compileResult = Command.Create("dotnet-compile", args)
var compileResult = Command.CreateDotNet("compile", args)
.ForwardStdOut()
.ForwardStdErr()
.Execute();

0
src/dotnet-build/IncrementalPreconditions.cs → src/dotnet/commands/dotnet-build/IncrementalPreconditions.cs
View file

4
src/dotnet-build/Program.cs → src/dotnet/commands/dotnet-build/Program.cs
View file

@ -11,9 +11,9 @@ using Microsoft.DotNet.Tools.Compiler;
namespace Microsoft.DotNet.Tools.Build
{
public class Program
public class BuildCommand
{
public static int Main(string[] args)
public static int Run(string[] args)
{
DebugHelper.HandleDebugSwitch(ref args);

0
src/dotnet-build/ProjectDependenciesFacade.cs → src/dotnet/commands/dotnet-build/ProjectDependenciesFacade.cs
View file

0
src/dotnet-build/README.md → src/dotnet/commands/dotnet-build/README.md
View file

4
src/dotnet-compile-csc/Program.cs → src/dotnet/commands/dotnet-compile-csc/Program.cs
View file

@ -15,11 +15,11 @@ using Microsoft.DotNet.ProjectModel;
namespace Microsoft.DotNet.Tools.Compiler.Csc
{
public class Program
public class CompileCscCommand
{
private const int ExitFailed = 1;
public static int Main(string[] args)
public static int Run(string[] args)
{
DebugHelper.HandleDebugSwitch(ref args);

0
src/dotnet-compile-csc/README.md → src/dotnet/commands/dotnet-compile-csc/README.md
View file

4
src/dotnet-compile-fsc/Program.cs → src/dotnet/commands/dotnet-compile-fsc/Program.cs
View file

@ -15,11 +15,11 @@ using Microsoft.DotNet.ProjectModel;
namespace Microsoft.DotNet.Tools.Compiler.Fsc
{
public class Program
public class CompileFscCommand
{
private const int ExitFailed = 1;
public static int Main(string[] args)
public static int Run(string[] args)
{
DebugHelper.HandleDebugSwitch(ref args);

0
src/dotnet-compile-native/ArgValues.cs → src/dotnet/commands/dotnet-compile-native/ArgValues.cs
View file

0
src/dotnet-compile-native/ArgumentsParser.cs → src/dotnet/commands/dotnet-compile-native/ArgumentsParser.cs
View file

0
src/dotnet-compile-native/DirectoryExtensions.cs → src/dotnet/commands/dotnet-compile-native/DirectoryExtensions.cs
View file

0
src/dotnet-compile-native/EnumExtensions.cs → src/dotnet/commands/dotnet-compile-native/EnumExtensions.cs
View file

0
src/dotnet-compile-native/ILCompilerInvoker.cs → src/dotnet/commands/dotnet-compile-native/ILCompilerInvoker.cs
View file

0
src/dotnet-compile-native/IntermediateCompilation/IPlatformNativeStep.cs → src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/IPlatformNativeStep.cs
View file

0
src/dotnet-compile-native/IntermediateCompilation/IntermediateCompiler.cs → src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/IntermediateCompiler.cs
View file

0
src/dotnet-compile-native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs → src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs
View file

0
src/dotnet-compile-native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs → src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs
View file

0
src/dotnet-compile-native/IntermediateCompilation/Mac/MacCppCompileStep.cs → src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Mac/MacCppCompileStep.cs
View file

0
src/dotnet-compile-native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs → src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs
View file

0
src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCommon.cs → src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCommon.cs
View file

0
src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs → src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs
View file

0
src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsLinkStep.cs → src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Windows/WindowsLinkStep.cs
View file

0
src/dotnet-compile-native/NativeCompileSettings.cs → src/dotnet/commands/dotnet-compile-native/NativeCompileSettings.cs
View file

0
src/dotnet-compile-native/NativeCompiler.cs → src/dotnet/commands/dotnet-compile-native/NativeCompiler.cs
View file

4
src/dotnet-compile-native/Program.cs → src/dotnet/commands/dotnet-compile-native/Program.cs
View file

@ -4,9 +4,9 @@ using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Compiler.Native
{
public class Program
public class CompileNativeCommand
{
public static int Main(string[] args)
public static int Run(string[] args)
{
DebugHelper.HandleDebugSwitch(ref args);

0
src/dotnet-compile-native/README.md → src/dotnet/commands/dotnet-compile-native/README.md
View file

0
src/dotnet-compile-native/RuntimeExtensions.cs → src/dotnet/commands/dotnet-compile-native/RuntimeExtensions.cs
View file

0
src/dotnet-compile-native/RuntimeInformationExtensions.cs → src/dotnet/commands/dotnet-compile-native/RuntimeInformationExtensions.cs
View file

0
src/dotnet-compile-native/appdep/project.json → src/dotnet/commands/dotnet-compile-native/appdep/project.json
View file

0
src/dotnet-compile-native/enums/ArchitectureMode.cs → src/dotnet/commands/dotnet-compile-native/enums/ArchitectureMode.cs
View file

0
src/dotnet-compile-native/enums/BuildConfiguration.cs → src/dotnet/commands/dotnet-compile-native/enums/BuildConfiguration.cs
View file

0
src/dotnet-compile-native/enums/NativeIntermediateMode.cs → src/dotnet/commands/dotnet-compile-native/enums/NativeIntermediateMode.cs
View file

0
src/dotnet-compile-native/enums/OSMode.cs → src/dotnet/commands/dotnet-compile-native/enums/OSMode.cs
View file

0
src/dotnet-compile/CanonicalError.cs → src/dotnet/commands/dotnet-compile/CanonicalError.cs
View file

0
src/dotnet-compile/CompilerCommandApp.cs → src/dotnet/commands/dotnet-compile/CompilerCommandApp.cs
View file

3
src/dotnet-compile/CompilerUtil.cs → src/dotnet/commands/dotnet-compile/CompilerUtil.cs
View file

@ -11,7 +11,6 @@ using Microsoft.DotNet.ProjectModel;
using Microsoft.DotNet.Cli.Compiler.Common;
using Microsoft.DotNet.ProjectModel.Compilation;
using Microsoft.DotNet.Tools.Common;
using NuGet.Frameworks;
// This class is responsible with defining the arguments for the Compile verb.
// It knows how to interpret them and set default values
@ -149,7 +148,7 @@ namespace Microsoft.DotNet.Tools.Compiler
//used in incremental precondition checks
public static IEnumerable<string> GetCommandsInvokedByCompile(ProjectContext project)
{
return new List<string> {ResolveCompilerName(project), "dotnet-compile"};
return new List<string> {ResolveCompilerName(project), "compile"};
}
}
}

12
src/dotnet-compile/Program.cs → src/dotnet/commands/dotnet-compile/Program.cs
View file

@ -17,10 +17,10 @@ using Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.DotNet.Tools.Compiler
{
public class Program
public class CommpileCommand
{
public static int Main(string[] args)
public static int Run(string[] args)
{
DebugHelper.HandleDebugSwitch(ref args);
@ -147,7 +147,7 @@ namespace Microsoft.DotNet.Tools.Compiler
// Need CoreRT Framework published to nuget
// Do Native Compilation
var result = Command.Create("dotnet-compile-native", new string[] { "--rsp", $"{rsp}" })
var result = Command.CreateDotNet("compile-native", new string[] { "--rsp", $"{rsp}" })
.ForwardStdErr()
.ForwardStdOut()
.Execute();
@ -275,7 +275,7 @@ namespace Microsoft.DotNet.Tools.Compiler
};
RunScripts(context, ScriptNames.PreCompile, contextVariables);
var result = Command.Create($"dotnet-compile-{compilerName}", new[] { "@" + $"{rsp}" })
var result = Command.CreateDotNet($"compile-{compilerName}", new[] { "@" + $"{rsp}" })
.OnErrorLine(line =>
{
var diagnostic = ParseDiagnostic(context.ProjectDirectory, line);
@ -371,7 +371,7 @@ namespace Microsoft.DotNet.Tools.Compiler
if (ResourceUtility.IsResxFile(resgenFile.InputFile))
{
var result =
Command.Create("dotnet-resgen",
Command.CreateDotNet("resgen",
new string[]
{
$"{resgenFile.InputFile}",
@ -424,7 +424,7 @@ namespace Microsoft.DotNet.Tools.Compiler
arguments.Add($"-v {project.Version.Version}");
arguments.AddRange(resgenFile.InputFileToMetadata.Select(fileToMetadata => $"\"{fileToMetadata.Key}\",{fileToMetadata.Value}"));
var result = Command.Create("dotnet-resgen", arguments)
var result = Command.CreateDotNet("resgen", arguments)
.ForwardStdErr()
.ForwardStdOut()
.Execute();

0
src/dotnet-compile/README.md → src/dotnet/commands/dotnet-compile/README.md
View file

0
src/dotnet-compile/ResourceManifestName.cs → src/dotnet/commands/dotnet-compile/ResourceManifestName.cs
View file

0
src/dotnet-new/CSharp_Console/NuGet.Config → src/dotnet/commands/dotnet-new/CSharp_Console/NuGet.Config
View file

0
src/dotnet-new/CSharp_Console/Program.cs → src/dotnet/commands/dotnet-new/CSharp_Console/Program.cs
View file

0
src/dotnet-new/CSharp_Console/project.json → src/dotnet/commands/dotnet-new/CSharp_Console/project.json
View file

0
src/dotnet-new/FSharp_Console/NuGet.Config → src/dotnet/commands/dotnet-new/FSharp_Console/NuGet.Config
View file

0
src/dotnet-new/FSharp_Console/Program.fs → src/dotnet/commands/dotnet-new/FSharp_Console/Program.fs
View file

0
src/dotnet-new/FSharp_Console/project.json → src/dotnet/commands/dotnet-new/FSharp_Console/project.json
View file

9
src/dotnet-new/Program.cs → src/dotnet/commands/dotnet-new/Program.cs
View file

@ -5,11 +5,10 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
namespace Microsoft.DotNet.Tools.New
{
public class Program
public class NewCommand
{
private static string GetFileNameFromResourceName(string s)
{
@ -26,7 +25,7 @@ namespace Microsoft.DotNet.Tools.New
public int CreateEmptyProject(string languageName, string templateDir)
{
var thisAssembly = typeof(Program).GetTypeInfo().Assembly;
var thisAssembly = typeof(NewCommand).GetTypeInfo().Assembly;
var resources = from resourceName in thisAssembly.GetManifestResourceNames()
where resourceName.Contains(templateDir)
select resourceName;
@ -67,7 +66,7 @@ namespace Microsoft.DotNet.Tools.New
return 0;
}
public static int Main(string[] args)
public static int Run(string[] args)
{
DebugHelper.HandleDebugSwitch(ref args);
@ -80,7 +79,7 @@ namespace Microsoft.DotNet.Tools.New
var lang = app.Option("-l|--lang <LANGUAGE>", "Language of project [C#|F#]", CommandOptionType.SingleValue);
var type = app.Option("-t|--type <TYPE>", "Type of project", CommandOptionType.SingleValue);
var dotnetNew = new Program();
var dotnetNew = new NewCommand();
app.OnExecute(() => {
var csharp = new { Name = "C#", Alias = new[] { "c#", "cs", "csharp" }, TemplatePrefix = "CSharp", Templates = new[] { "Console" } };

0
src/dotnet-new/README.md → src/dotnet/commands/dotnet-new/README.md
View file

0
src/dotnet-pack/ArtifactPathsCalculator.cs → src/dotnet/commands/dotnet-pack/ArtifactPathsCalculator.cs
View file

2
src/dotnet-pack/BuildProjectCommand.cs → src/dotnet/commands/dotnet-pack/BuildProjectCommand.cs
View file

@ -58,7 +58,7 @@ namespace Microsoft.DotNet.Tools.Pack
argsBuilder.Add($"{_project.ProjectFilePath}");
var result = Command.Create("dotnet-build", argsBuilder)
var result = Command.CreateDotNet("build", argsBuilder)
.ForwardStdOut()
.ForwardStdErr()
.Execute();

0
src/dotnet-pack/NuGet/Constants.cs → src/dotnet/commands/dotnet-pack/NuGet/Constants.cs
View file

0
src/dotnet-pack/NuGet/EmptyFrameworkFolderFile.cs → src/dotnet/commands/dotnet-pack/NuGet/EmptyFrameworkFolderFile.cs
View file

0
src/dotnet-pack/NuGet/FrameworkAssemblyReference.cs → src/dotnet/commands/dotnet-pack/NuGet/FrameworkAssemblyReference.cs
View file

0
src/dotnet-pack/NuGet/IPackageFile.cs → src/dotnet/commands/dotnet-pack/NuGet/IPackageFile.cs
View file

0
src/dotnet-pack/NuGet/Manifest.cs → src/dotnet/commands/dotnet-pack/NuGet/Manifest.cs
View file

0
src/dotnet-pack/NuGet/ManifestContentFiles.cs → src/dotnet/commands/dotnet-pack/NuGet/ManifestContentFiles.cs
View file

0
src/dotnet-pack/NuGet/ManifestFile.cs → src/dotnet/commands/dotnet-pack/NuGet/ManifestFile.cs
View file

0
src/dotnet-pack/NuGet/ManifestMetadata.cs → src/dotnet/commands/dotnet-pack/NuGet/ManifestMetadata.cs
View file

0
src/dotnet-pack/NuGet/ManifestReader.cs → src/dotnet/commands/dotnet-pack/NuGet/ManifestReader.cs
View file

0
src/dotnet-pack/NuGet/ManifestSchemaUtility.cs → src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs
View file

0
src/dotnet-pack/NuGet/ManifestVersionAttribute.cs → src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionAttribute.cs
View file

0
src/dotnet-pack/NuGet/ManifestVersionUtility.cs → src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs
View file

Some files were not shown because too many files have changed in this diff Show more