From dfc59eb20eef8201574d4081df3db58f5167e8ab Mon Sep 17 00:00:00 2001 From: David Fowler Date: Sat, 30 Jan 2016 21:47:50 -0800 Subject: [PATCH 1/3] Everything in the same project - Build in intrinsic commands as part of dotnet --- scripts/build/build_appdeps.sh | 2 +- scripts/configuration/buildProjects.csv | 19 ------- src/Microsoft.DotNet.Cli.Utils/Command.cs | 8 ++- src/dotnet-build/dotnet-build.xproj | 20 ------- src/dotnet-build/project.json | 24 -------- .../Properties/AssemblyInfo.cs | 26 --------- .../dotnet-compile-csc.xproj | 20 ------- src/dotnet-compile-csc/project.json | 26 --------- .../dotnet-compile-fsc.xproj | 20 ------- src/dotnet-compile-fsc/project.json | 25 -------- .../dotnet-compile-native.xproj | 19 ------- src/dotnet-compile-native/project.json | 25 -------- src/dotnet-compile/dotnet-compile.xproj | 20 ------- src/dotnet-compile/project.json | 29 ---------- src/dotnet-new/dotnet-new.xproj | 18 ------ src/dotnet-new/project.json | 25 -------- src/dotnet-pack/dotnet-pack.xproj | 19 ------- src/dotnet-pack/project.json | 26 --------- .../dotnet-projectmodel-server.xproj | 19 ------- src/dotnet-projectmodel-server/project.json | 27 --------- src/dotnet-publish/dotnet-publish.xproj | 19 ------- src/dotnet-publish/project.json | 23 -------- src/dotnet-repl-csi/dotnet-repl-csi.xproj | 20 ------- src/dotnet-repl-csi/project.json | 24 -------- src/dotnet-repl/dotnet-repl.xproj | 20 ------- src/dotnet-repl/project.json | 23 -------- src/dotnet-resgen/Properties/AssemblyInfo.cs | 26 --------- src/dotnet-resgen/dotnet-resgen.xproj | 20 ------- src/dotnet-resgen/project.json | 26 --------- src/dotnet-restore/Properties/AssemblyInfo.cs | 8 --- src/dotnet-restore/dotnet-restore.xproj | 17 ------ src/dotnet-restore/project.json | 38 ------------- src/dotnet-run/dotnet-run.xproj | 19 ------- src/dotnet-run/project.json | 23 -------- src/dotnet-test/Properties/AssemblyInfo.cs | 8 --- src/dotnet-test/project.json | 41 ------------- src/dotnet/Program.cs | 41 ++++++++++++- .../dotnet-build/BuilderCommandApp.cs | 0 .../commands}/dotnet-build/CompileContext.cs | 6 +- .../dotnet-build/IncrementalPreconditions.cs | 0 .../commands}/dotnet-build/Program.cs | 4 +- .../dotnet-build/ProjectDependenciesFacade.cs | 0 .../commands}/dotnet-build/README.md | 0 .../commands}/dotnet-compile-csc/Program.cs | 4 +- .../commands}/dotnet-compile-csc/README.md | 0 .../commands}/dotnet-compile-fsc/Program.cs | 4 +- .../dotnet-compile-native/ArgValues.cs | 0 .../dotnet-compile-native/ArgumentsParser.cs | 0 .../DirectoryExtensions.cs | 0 .../dotnet-compile-native/EnumExtensions.cs | 0 .../ILCompilerInvoker.cs | 0 .../IPlatformNativeStep.cs | 0 .../IntermediateCompiler.cs | 0 .../Linux/LinuxCppCompileStep.cs | 0 .../Linux/LinuxRyuJitCompileStep.cs | 0 .../Mac/MacCppCompileStep.cs | 0 .../Mac/MacRyuJitCompileStep.cs | 0 .../Windows/WindowsCommon.cs | 0 .../Windows/WindowsCppCompileStep.cs | 0 .../Windows/WindowsLinkStep.cs | 0 .../NativeCompileSettings.cs | 0 .../dotnet-compile-native/NativeCompiler.cs | 0 .../dotnet-compile-native/Program.cs | 4 +- .../commands}/dotnet-compile-native/README.md | 0 .../RuntimeExtensions.cs | 0 .../RuntimeInformationExtensions.cs | 0 .../dotnet-compile-native/appdep/project.json | 0 .../enums/ArchitectureMode.cs | 0 .../enums/BuildConfiguration.cs | 0 .../enums/NativeIntermediateMode.cs | 0 .../dotnet-compile-native/enums/OSMode.cs | 0 .../dotnet-compile/CanonicalError.cs | 0 .../dotnet-compile/CompilerCommandApp.cs | 0 .../commands}/dotnet-compile/CompilerUtil.cs | 3 +- .../commands}/dotnet-compile/Program.cs | 12 ++-- .../commands}/dotnet-compile/README.md | 0 .../dotnet-compile/ResourceManifestName.cs | 0 .../dotnet-new/CSharp_Console/NuGet.Config | 0 .../dotnet-new/CSharp_Console/Program.cs | 0 .../dotnet-new/CSharp_Console/project.json | 0 .../dotnet-new/FSharp_Console/NuGet.Config | 0 .../dotnet-new/FSharp_Console/Program.fs | 0 .../dotnet-new/FSharp_Console/project.json | 0 .../commands}/dotnet-new/Program.cs | 9 ++- .../commands}/dotnet-new/README.md | 0 .../dotnet-pack/ArtifactPathsCalculator.cs | 0 .../dotnet-pack/BuildProjectCommand.cs | 2 +- .../commands}/dotnet-pack/NuGet/Constants.cs | 0 .../NuGet/EmptyFrameworkFolderFile.cs | 0 .../NuGet/FrameworkAssemblyReference.cs | 0 .../dotnet-pack/NuGet/IPackageFile.cs | 0 .../commands}/dotnet-pack/NuGet/Manifest.cs | 0 .../dotnet-pack/NuGet/ManifestContentFiles.cs | 0 .../dotnet-pack/NuGet/ManifestFile.cs | 0 .../dotnet-pack/NuGet/ManifestMetadata.cs | 0 .../dotnet-pack/NuGet/ManifestReader.cs | 0 .../NuGet/ManifestSchemaUtility.cs | 0 .../NuGet/ManifestVersionAttribute.cs | 0 .../NuGet/ManifestVersionUtility.cs | 0 .../dotnet-pack/NuGet/PackageBuilder.cs | 0 .../dotnet-pack/NuGet/PackageDependencySet.cs | 0 .../dotnet-pack/NuGet/PackageIdValidator.cs | 0 .../NuGet/PackageMetadataXmlExtensions.cs | 0 .../dotnet-pack/NuGet/PackageReferenceSet.cs | 0 .../dotnet-pack/NuGet/PathResolver.cs | 0 .../dotnet-pack/NuGet/PathUtility.cs | 0 .../dotnet-pack/NuGet/PhysicalPackageFile.cs | 0 .../commands}/dotnet-pack/PackageGenerator.cs | 0 .../dotnet-pack/PackagesGenerator.cs | 0 .../commands}/dotnet-pack/Program.cs | 4 +- .../Properties/launchSettings.json | 0 .../dotnet-pack/SymbolPackageGenerator.cs | 0 .../ConnectionContext.cs | 0 .../Helpers/DependencyTypeChangeFinder.cs | 0 .../Helpers/JTokenExtensions.cs | 0 .../Helpers/LibraryExtensions.cs | 0 .../Helpers/NuGetFrameworkExtensions.cs | 0 .../Helpers/ProjectExtensions.cs | 0 .../InternalModels/ProjectContextSnapshot.cs | 0 .../InternalModels/ProjectSnapshot.cs | 0 .../MessageTypes.cs | 0 .../Messengers/CompilerOptionsMessenger.cs | 0 .../Messengers/DependenciesMessenger.cs | 0 .../DependencyDiagnosticsMessenger.cs | 0 .../Messengers/GlobalErrorMessenger.cs | 0 .../Messengers/Messenger.cs | 0 .../Messengers/ProjectDiagnosticsMessenger.cs | 0 .../Messengers/ProjectInformationMessenger.cs | 0 .../Messengers/ReferencesMessenger.cs | 0 .../Messengers/SourcesMessenger.cs | 0 .../Models/DependencyDescription.cs | 0 .../Models/DependencyItem.cs | 0 .../Models/DiagnosticMessageGroup.cs | 0 .../Models/DiagnosticMessageView.cs | 0 .../Models/DiagnosticsListMessage.cs | 0 .../Models/ErrorMessage.cs | 0 .../Models/FrameworkData.cs | 0 .../Models/Message.cs | 0 .../Models/ProjectReferenceDescription.cs | 0 .../ProcessingQueue.cs | 0 .../dotnet-projectmodel-server/Program.cs | 10 ++-- .../ProjectManager.cs | 0 .../ProtocolManager.cs | 0 .../commands}/dotnet-publish/Program.cs | 4 +- .../dotnet-publish/PublishCommand.cs | 4 +- .../commands}/dotnet-publish/README.md | 0 .../commands}/dotnet-repl-csi/Program.cs | 6 +- .../commands}/dotnet-repl/Program.cs | 6 +- .../commands}/dotnet-resgen/Program.cs | 4 +- .../ResourceAssemblyGenerator.cs | 0 .../commands}/dotnet-resgen/ResourceFile.cs | 0 .../dotnet-resgen/ResourceFileType.cs | 0 .../commands}/dotnet-resgen/ResourceSource.cs | 0 .../dotnet-resgen/ResourcesFileGenerator.cs | 0 .../commands}/dotnet-restore/NuGet3.cs | 0 .../commands}/dotnet-restore/Program.cs | 4 +- .../commands}/dotnet-restore/RestoreTask.cs | 0 .../commands}/dotnet-run/Program.cs | 4 +- .../commands}/dotnet-run/README.md | 0 .../commands}/dotnet-run/RunCommand.cs | 6 +- .../commands}/dotnet-test/Program.cs | 10 ++-- .../commands}/dotnet-test/ReportingChannel.cs | 0 .../commands}/dotnet-test/TestHostTracing.cs | 0 .../commands}/dotnet-test/dotnet-test.xproj | 0 src/dotnet/project.json | 57 ++++++++++++++++++- .../project.json | 3 +- 166 files changed, 156 insertions(+), 827 deletions(-) delete mode 100644 src/dotnet-build/dotnet-build.xproj delete mode 100644 src/dotnet-build/project.json delete mode 100644 src/dotnet-compile-csc/Properties/AssemblyInfo.cs delete mode 100644 src/dotnet-compile-csc/dotnet-compile-csc.xproj delete mode 100644 src/dotnet-compile-csc/project.json delete mode 100644 src/dotnet-compile-fsc/dotnet-compile-fsc.xproj delete mode 100644 src/dotnet-compile-fsc/project.json delete mode 100644 src/dotnet-compile-native/dotnet-compile-native.xproj delete mode 100644 src/dotnet-compile-native/project.json delete mode 100644 src/dotnet-compile/dotnet-compile.xproj delete mode 100644 src/dotnet-compile/project.json delete mode 100644 src/dotnet-new/dotnet-new.xproj delete mode 100644 src/dotnet-new/project.json delete mode 100644 src/dotnet-pack/dotnet-pack.xproj delete mode 100644 src/dotnet-pack/project.json delete mode 100644 src/dotnet-projectmodel-server/dotnet-projectmodel-server.xproj delete mode 100644 src/dotnet-projectmodel-server/project.json delete mode 100644 src/dotnet-publish/dotnet-publish.xproj delete mode 100644 src/dotnet-publish/project.json delete mode 100644 src/dotnet-repl-csi/dotnet-repl-csi.xproj delete mode 100644 src/dotnet-repl-csi/project.json delete mode 100644 src/dotnet-repl/dotnet-repl.xproj delete mode 100644 src/dotnet-repl/project.json delete mode 100644 src/dotnet-resgen/Properties/AssemblyInfo.cs delete mode 100644 src/dotnet-resgen/dotnet-resgen.xproj delete mode 100644 src/dotnet-resgen/project.json delete mode 100644 src/dotnet-restore/Properties/AssemblyInfo.cs delete mode 100644 src/dotnet-restore/dotnet-restore.xproj delete mode 100644 src/dotnet-restore/project.json delete mode 100644 src/dotnet-run/dotnet-run.xproj delete mode 100644 src/dotnet-run/project.json delete mode 100644 src/dotnet-test/Properties/AssemblyInfo.cs delete mode 100644 src/dotnet-test/project.json rename src/{ => dotnet/commands}/dotnet-build/BuilderCommandApp.cs (100%) rename src/{ => dotnet/commands}/dotnet-build/CompileContext.cs (98%) rename src/{ => dotnet/commands}/dotnet-build/IncrementalPreconditions.cs (100%) rename src/{ => dotnet/commands}/dotnet-build/Program.cs (95%) rename src/{ => dotnet/commands}/dotnet-build/ProjectDependenciesFacade.cs (100%) rename src/{ => dotnet/commands}/dotnet-build/README.md (100%) rename src/{ => dotnet/commands}/dotnet-compile-csc/Program.cs (98%) rename src/{ => dotnet/commands}/dotnet-compile-csc/README.md (100%) rename src/{ => dotnet/commands}/dotnet-compile-fsc/Program.cs (98%) rename src/{ => dotnet/commands}/dotnet-compile-native/ArgValues.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/ArgumentsParser.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/DirectoryExtensions.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/EnumExtensions.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/ILCompilerInvoker.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/IntermediateCompilation/IPlatformNativeStep.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/IntermediateCompilation/IntermediateCompiler.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/IntermediateCompilation/Mac/MacCppCompileStep.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCommon.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/IntermediateCompilation/Windows/WindowsLinkStep.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/NativeCompileSettings.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/NativeCompiler.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/Program.cs (96%) rename src/{ => dotnet/commands}/dotnet-compile-native/README.md (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/RuntimeExtensions.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/RuntimeInformationExtensions.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/appdep/project.json (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/enums/ArchitectureMode.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/enums/BuildConfiguration.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/enums/NativeIntermediateMode.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile-native/enums/OSMode.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile/CanonicalError.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile/CompilerCommandApp.cs (100%) rename src/{ => dotnet/commands}/dotnet-compile/CompilerUtil.cs (99%) rename src/{ => dotnet/commands}/dotnet-compile/Program.cs (97%) rename src/{ => dotnet/commands}/dotnet-compile/README.md (100%) rename src/{ => dotnet/commands}/dotnet-compile/ResourceManifestName.cs (100%) rename src/{ => dotnet/commands}/dotnet-new/CSharp_Console/NuGet.Config (100%) rename src/{ => dotnet/commands}/dotnet-new/CSharp_Console/Program.cs (100%) rename src/{ => dotnet/commands}/dotnet-new/CSharp_Console/project.json (100%) rename src/{ => dotnet/commands}/dotnet-new/FSharp_Console/NuGet.Config (100%) rename src/{ => dotnet/commands}/dotnet-new/FSharp_Console/Program.fs (100%) rename src/{ => dotnet/commands}/dotnet-new/FSharp_Console/project.json (100%) rename src/{ => dotnet/commands}/dotnet-new/Program.cs (95%) rename src/{ => dotnet/commands}/dotnet-new/README.md (100%) rename src/{ => dotnet/commands}/dotnet-pack/ArtifactPathsCalculator.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/BuildProjectCommand.cs (96%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/Constants.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/EmptyFrameworkFolderFile.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/FrameworkAssemblyReference.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/IPackageFile.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/Manifest.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/ManifestContentFiles.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/ManifestFile.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/ManifestMetadata.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/ManifestReader.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/ManifestSchemaUtility.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/ManifestVersionAttribute.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/ManifestVersionUtility.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/PackageBuilder.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/PackageDependencySet.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/PackageIdValidator.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/PackageMetadataXmlExtensions.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/PackageReferenceSet.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/PathResolver.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/PathUtility.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/NuGet/PhysicalPackageFile.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/PackageGenerator.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/PackagesGenerator.cs (100%) rename src/{ => dotnet/commands}/dotnet-pack/Program.cs (98%) rename src/{ => dotnet/commands}/dotnet-pack/Properties/launchSettings.json (100%) rename src/{ => dotnet/commands}/dotnet-pack/SymbolPackageGenerator.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/ConnectionContext.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Helpers/DependencyTypeChangeFinder.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Helpers/JTokenExtensions.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Helpers/LibraryExtensions.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Helpers/NuGetFrameworkExtensions.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Helpers/ProjectExtensions.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/InternalModels/ProjectContextSnapshot.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/InternalModels/ProjectSnapshot.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/MessageTypes.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Messengers/CompilerOptionsMessenger.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Messengers/DependenciesMessenger.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Messengers/DependencyDiagnosticsMessenger.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Messengers/GlobalErrorMessenger.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Messengers/Messenger.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Messengers/ProjectDiagnosticsMessenger.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Messengers/ProjectInformationMessenger.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Messengers/ReferencesMessenger.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Messengers/SourcesMessenger.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Models/DependencyDescription.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Models/DependencyItem.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Models/DiagnosticMessageGroup.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Models/DiagnosticMessageView.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Models/DiagnosticsListMessage.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Models/ErrorMessage.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Models/FrameworkData.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Models/Message.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Models/ProjectReferenceDescription.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/ProcessingQueue.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/Program.cs (93%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/ProjectManager.cs (100%) rename src/{ => dotnet/commands}/dotnet-projectmodel-server/ProtocolManager.cs (100%) rename src/{ => dotnet/commands}/dotnet-publish/Program.cs (97%) rename src/{ => dotnet/commands}/dotnet-publish/PublishCommand.cs (99%) rename src/{ => dotnet/commands}/dotnet-publish/README.md (100%) rename src/{ => dotnet/commands}/dotnet-repl-csi/Program.cs (98%) rename src/{ => dotnet/commands}/dotnet-repl/Program.cs (94%) rename src/{ => dotnet/commands}/dotnet-resgen/Program.cs (98%) rename src/{ => dotnet/commands}/dotnet-resgen/ResourceAssemblyGenerator.cs (100%) rename src/{ => dotnet/commands}/dotnet-resgen/ResourceFile.cs (100%) rename src/{ => dotnet/commands}/dotnet-resgen/ResourceFileType.cs (100%) rename src/{ => dotnet/commands}/dotnet-resgen/ResourceSource.cs (100%) rename src/{ => dotnet/commands}/dotnet-resgen/ResourcesFileGenerator.cs (100%) rename src/{ => dotnet/commands}/dotnet-restore/NuGet3.cs (100%) rename src/{ => dotnet/commands}/dotnet-restore/Program.cs (98%) rename src/{ => dotnet/commands}/dotnet-restore/RestoreTask.cs (100%) rename src/{ => dotnet/commands}/dotnet-run/Program.cs (96%) rename src/{ => dotnet/commands}/dotnet-run/README.md (100%) rename src/{ => dotnet/commands}/dotnet-run/RunCommand.cs (96%) rename src/{ => dotnet/commands}/dotnet-test/Program.cs (96%) rename src/{ => dotnet/commands}/dotnet-test/ReportingChannel.cs (100%) rename src/{ => dotnet/commands}/dotnet-test/TestHostTracing.cs (100%) rename src/{ => dotnet/commands}/dotnet-test/dotnet-test.xproj (100%) diff --git a/scripts/build/build_appdeps.sh b/scripts/build/build_appdeps.sh index 3327fb7c2..af180121d 100755 --- a/scripts/build/build_appdeps.sh +++ b/scripts/build/build_appdeps.sh @@ -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 diff --git a/scripts/configuration/buildProjects.csv b/scripts/configuration/buildProjects.csv index 35248851d..3d25d1bdf 100644 --- a/scripts/configuration/buildProjects.csv +++ b/scripts/configuration/buildProjects.csv @@ -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 diff --git a/src/Microsoft.DotNet.Cli.Utils/Command.cs b/src/Microsoft.DotNet.Cli.Utils/Command.cs index 8f75721c7..e8a0c7d60 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Command.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Command.cs @@ -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 args, NuGetFramework framework = null, bool useComSpec = false) + { + return Create("dotnet", new[] { commandName }.Concat(args), framework, useComSpec); + } + /// /// 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 /// public static Command Create(string commandName, IEnumerable 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) { diff --git a/src/dotnet-build/dotnet-build.xproj b/src/dotnet-build/dotnet-build.xproj deleted file mode 100644 index 3eafb1ca3..000000000 --- a/src/dotnet-build/dotnet-build.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 0a309227-a9d8-4ddf-88dd-326b57b04379 - Microsoft.DotNet.Tools.Build - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - 2.0 - - - diff --git a/src/dotnet-build/project.json b/src/dotnet-build/project.json deleted file mode 100644 index 04ece5554..000000000 --- a/src/dotnet-build/project.json +++ /dev/null @@ -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": { - } -} diff --git a/src/dotnet-compile-csc/Properties/AssemblyInfo.cs b/src/dotnet-compile-csc/Properties/AssemblyInfo.cs deleted file mode 100644 index d4fa38929..000000000 --- a/src/dotnet-compile-csc/Properties/AssemblyInfo.cs +++ /dev/null @@ -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")] diff --git a/src/dotnet-compile-csc/dotnet-compile-csc.xproj b/src/dotnet-compile-csc/dotnet-compile-csc.xproj deleted file mode 100644 index 58fb85e76..000000000 --- a/src/dotnet-compile-csc/dotnet-compile-csc.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - b559378c-fc03-45fa-893c-71784f28e0a2 - Microsoft.DotNet.Tools.Compiler.Csc - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - 2.0 - - - diff --git a/src/dotnet-compile-csc/project.json b/src/dotnet-compile-csc/project.json deleted file mode 100644 index ea410a52d..000000000 --- a/src/dotnet-compile-csc/project.json +++ /dev/null @@ -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": { - } -} diff --git a/src/dotnet-compile-fsc/dotnet-compile-fsc.xproj b/src/dotnet-compile-fsc/dotnet-compile-fsc.xproj deleted file mode 100644 index 4e3e52752..000000000 --- a/src/dotnet-compile-fsc/dotnet-compile-fsc.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 74f25188-bf63-4bf3-879b-b6cdb11ed608 - Microsoft.DotNet.Tools.Compiler.Fsc - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - 2.0 - - - diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json deleted file mode 100644 index 22df82ffb..000000000 --- a/src/dotnet-compile-fsc/project.json +++ /dev/null @@ -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": { - } -} diff --git a/src/dotnet-compile-native/dotnet-compile-native.xproj b/src/dotnet-compile-native/dotnet-compile-native.xproj deleted file mode 100644 index 3890367a0..000000000 --- a/src/dotnet-compile-native/dotnet-compile-native.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 172485dd-b94e-4f3e-851e-cf23908ff960 - Microsoft.DotNet.Tools.Compiler.Native - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/dotnet-compile-native/project.json b/src/dotnet-compile-native/project.json deleted file mode 100644 index b034758a8..000000000 --- a/src/dotnet-compile-native/project.json +++ /dev/null @@ -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": { - } -} diff --git a/src/dotnet-compile/dotnet-compile.xproj b/src/dotnet-compile/dotnet-compile.xproj deleted file mode 100644 index ced479ff8..000000000 --- a/src/dotnet-compile/dotnet-compile.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 0a309227-a9d8-4ddf-88dd-326b57b04378 - Microsoft.DotNet.Tools.Compiler - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - 2.0 - - - diff --git a/src/dotnet-compile/project.json b/src/dotnet-compile/project.json deleted file mode 100644 index 8d1b17a5a..000000000 --- a/src/dotnet-compile/project.json +++ /dev/null @@ -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": { - } -} diff --git a/src/dotnet-new/dotnet-new.xproj b/src/dotnet-new/dotnet-new.xproj deleted file mode 100644 index 4a4a0a018..000000000 --- a/src/dotnet-new/dotnet-new.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - bc765fbf-ad7a-4a99-9902-5540c5a74181 - Microsoft.DotNet.Tools.New - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/dotnet-new/project.json b/src/dotnet-new/project.json deleted file mode 100644 index d3c092952..000000000 --- a/src/dotnet-new/project.json +++ /dev/null @@ -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": { - } -} diff --git a/src/dotnet-pack/dotnet-pack.xproj b/src/dotnet-pack/dotnet-pack.xproj deleted file mode 100644 index a8c80953d..000000000 --- a/src/dotnet-pack/dotnet-pack.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0f480791-4ba0-44e3-8cc4-c71656664175 - Microsoft.DotNet.Tools.Pack - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/dotnet-pack/project.json b/src/dotnet-pack/project.json deleted file mode 100644 index 28d8eca1d..000000000 --- a/src/dotnet-pack/project.json +++ /dev/null @@ -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": { - } -} - diff --git a/src/dotnet-projectmodel-server/dotnet-projectmodel-server.xproj b/src/dotnet-projectmodel-server/dotnet-projectmodel-server.xproj deleted file mode 100644 index 4111ad8d2..000000000 --- a/src/dotnet-projectmodel-server/dotnet-projectmodel-server.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 1ea9af94-5494-40dd-a05b-9d564572ccfc - Microsoft.DotNet.ProjectModel.Server - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/dotnet-projectmodel-server/project.json b/src/dotnet-projectmodel-server/project.json deleted file mode 100644 index 6976e8158..000000000 --- a/src/dotnet-projectmodel-server/project.json +++ /dev/null @@ -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": { - } -} diff --git a/src/dotnet-publish/dotnet-publish.xproj b/src/dotnet-publish/dotnet-publish.xproj deleted file mode 100644 index 1cc3fb3ac..000000000 --- a/src/dotnet-publish/dotnet-publish.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 391d6ad6-0fd5-4e1e-a4c8-6b5439d197b5 - Microsoft.DotNet.Tools.Publish - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/dotnet-publish/project.json b/src/dotnet-publish/project.json deleted file mode 100644 index ddc2a2734..000000000 --- a/src/dotnet-publish/project.json +++ /dev/null @@ -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": { - } -} diff --git a/src/dotnet-repl-csi/dotnet-repl-csi.xproj b/src/dotnet-repl-csi/dotnet-repl-csi.xproj deleted file mode 100644 index 20c16fff6..000000000 --- a/src/dotnet-repl-csi/dotnet-repl-csi.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 717a4ed9-8897-492f-bd0c-230fcaea9237 - Microsoft.DotNet.Tools.Repl.Csi - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - 2.0 - - - diff --git a/src/dotnet-repl-csi/project.json b/src/dotnet-repl-csi/project.json deleted file mode 100644 index b67bd3332..000000000 --- a/src/dotnet-repl-csi/project.json +++ /dev/null @@ -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": { - } -} diff --git a/src/dotnet-repl/dotnet-repl.xproj b/src/dotnet-repl/dotnet-repl.xproj deleted file mode 100644 index afb4d6c36..000000000 --- a/src/dotnet-repl/dotnet-repl.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - b317356c-99de-499e-8b4d-d6bec5da57d5 - Microsoft.DotNet.Tools.Repl - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - 2.0 - - - diff --git a/src/dotnet-repl/project.json b/src/dotnet-repl/project.json deleted file mode 100644 index ddc2a2734..000000000 --- a/src/dotnet-repl/project.json +++ /dev/null @@ -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": { - } -} diff --git a/src/dotnet-resgen/Properties/AssemblyInfo.cs b/src/dotnet-resgen/Properties/AssemblyInfo.cs deleted file mode 100644 index 28cdc14e0..000000000 --- a/src/dotnet-resgen/Properties/AssemblyInfo.cs +++ /dev/null @@ -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")] diff --git a/src/dotnet-resgen/dotnet-resgen.xproj b/src/dotnet-resgen/dotnet-resgen.xproj deleted file mode 100644 index abf38884b..000000000 --- a/src/dotnet-resgen/dotnet-resgen.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 585fc6f6-48e0-4ea5-8015-0264614e97c0 - Microsoft.DotNet.Tools.Resgen - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - 2.0 - - - diff --git a/src/dotnet-resgen/project.json b/src/dotnet-resgen/project.json deleted file mode 100644 index b04e0038d..000000000 --- a/src/dotnet-resgen/project.json +++ /dev/null @@ -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": { - } -} diff --git a/src/dotnet-restore/Properties/AssemblyInfo.cs b/src/dotnet-restore/Properties/AssemblyInfo.cs deleted file mode 100644 index cdbb8074c..000000000 --- a/src/dotnet-restore/Properties/AssemblyInfo.cs +++ /dev/null @@ -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")] \ No newline at end of file diff --git a/src/dotnet-restore/dotnet-restore.xproj b/src/dotnet-restore/dotnet-restore.xproj deleted file mode 100644 index 3536fe1b8..000000000 --- a/src/dotnet-restore/dotnet-restore.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 79620410-4ec7-4a38-a8c3-ee81243f818e - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/dotnet-restore/project.json b/src/dotnet-restore/project.json deleted file mode 100644 index f98cd459c..000000000 --- a/src/dotnet-restore/project.json +++ /dev/null @@ -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": { - } -} diff --git a/src/dotnet-run/dotnet-run.xproj b/src/dotnet-run/dotnet-run.xproj deleted file mode 100644 index dcf20c34f..000000000 --- a/src/dotnet-run/dotnet-run.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 1c16108c-c786-482d-bb0a-36bdafe109ed - Microsoft.DotNet.Tools.Run - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/dotnet-run/project.json b/src/dotnet-run/project.json deleted file mode 100644 index 777742022..000000000 --- a/src/dotnet-run/project.json +++ /dev/null @@ -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": { - } -} diff --git a/src/dotnet-test/Properties/AssemblyInfo.cs b/src/dotnet-test/Properties/AssemblyInfo.cs deleted file mode 100644 index cdbb8074c..000000000 --- a/src/dotnet-test/Properties/AssemblyInfo.cs +++ /dev/null @@ -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")] \ No newline at end of file diff --git a/src/dotnet-test/project.json b/src/dotnet-test/project.json deleted file mode 100644 index 850ed6168..000000000 --- a/src/dotnet-test/project.json +++ /dev/null @@ -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": { } - } -} diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index a1e41d92d..350b75521 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -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,31 @@ Common Commands: return RunHelpCommand(appArgs); } + var builtIns = new Dictionary> + { + ["build"] = BuildCommand.Run, + ["compile"] = CommpileCommand.Run, + ["compile-csc"] = CompileCscCommand.Run, + ["compile-fsc"] = CompileFscCommand.Run, + ["compile-native"] = CompileNativeCommand.Run, + ["new"] = NewCommand.Run, + ["projectmodel-server"] = ProjectModelServerCommand.Run, + ["publish"] = PublishCommand.Run, + ["restore"] = RestoreCommand.Run, + ["resgen"] = ResgenCommand.Run, + ["run"] = RunCommand.Run, + ["test"] = TestCommand.Run + }; + + Func 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) diff --git a/src/dotnet-build/BuilderCommandApp.cs b/src/dotnet/commands/dotnet-build/BuilderCommandApp.cs similarity index 100% rename from src/dotnet-build/BuilderCommandApp.cs rename to src/dotnet/commands/dotnet-build/BuilderCommandApp.cs diff --git a/src/dotnet-build/CompileContext.cs b/src/dotnet/commands/dotnet-build/CompileContext.cs similarity index 98% rename from src/dotnet-build/CompileContext.cs rename to src/dotnet/commands/dotnet-build/CompileContext.cs index a70c92aac..d1d1d708a 100644 --- a/src/dotnet-build/CompileContext.cs +++ b/src/dotnet/commands/dotnet-build/CompileContext.cs @@ -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(), project.TargetFramework)) + .Select(commandName => Command.CreateDotNet(commandName, Enumerable.Empty(), 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(); diff --git a/src/dotnet-build/IncrementalPreconditions.cs b/src/dotnet/commands/dotnet-build/IncrementalPreconditions.cs similarity index 100% rename from src/dotnet-build/IncrementalPreconditions.cs rename to src/dotnet/commands/dotnet-build/IncrementalPreconditions.cs diff --git a/src/dotnet-build/Program.cs b/src/dotnet/commands/dotnet-build/Program.cs similarity index 95% rename from src/dotnet-build/Program.cs rename to src/dotnet/commands/dotnet-build/Program.cs index 67c2a7008..c44ac6471 100644 --- a/src/dotnet-build/Program.cs +++ b/src/dotnet/commands/dotnet-build/Program.cs @@ -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); diff --git a/src/dotnet-build/ProjectDependenciesFacade.cs b/src/dotnet/commands/dotnet-build/ProjectDependenciesFacade.cs similarity index 100% rename from src/dotnet-build/ProjectDependenciesFacade.cs rename to src/dotnet/commands/dotnet-build/ProjectDependenciesFacade.cs diff --git a/src/dotnet-build/README.md b/src/dotnet/commands/dotnet-build/README.md similarity index 100% rename from src/dotnet-build/README.md rename to src/dotnet/commands/dotnet-build/README.md diff --git a/src/dotnet-compile-csc/Program.cs b/src/dotnet/commands/dotnet-compile-csc/Program.cs similarity index 98% rename from src/dotnet-compile-csc/Program.cs rename to src/dotnet/commands/dotnet-compile-csc/Program.cs index 3f0ca8069..414d8ef83 100644 --- a/src/dotnet-compile-csc/Program.cs +++ b/src/dotnet/commands/dotnet-compile-csc/Program.cs @@ -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); diff --git a/src/dotnet-compile-csc/README.md b/src/dotnet/commands/dotnet-compile-csc/README.md similarity index 100% rename from src/dotnet-compile-csc/README.md rename to src/dotnet/commands/dotnet-compile-csc/README.md diff --git a/src/dotnet-compile-fsc/Program.cs b/src/dotnet/commands/dotnet-compile-fsc/Program.cs similarity index 98% rename from src/dotnet-compile-fsc/Program.cs rename to src/dotnet/commands/dotnet-compile-fsc/Program.cs index 5dfa7e04b..e22954eba 100644 --- a/src/dotnet-compile-fsc/Program.cs +++ b/src/dotnet/commands/dotnet-compile-fsc/Program.cs @@ -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); diff --git a/src/dotnet-compile-native/ArgValues.cs b/src/dotnet/commands/dotnet-compile-native/ArgValues.cs similarity index 100% rename from src/dotnet-compile-native/ArgValues.cs rename to src/dotnet/commands/dotnet-compile-native/ArgValues.cs diff --git a/src/dotnet-compile-native/ArgumentsParser.cs b/src/dotnet/commands/dotnet-compile-native/ArgumentsParser.cs similarity index 100% rename from src/dotnet-compile-native/ArgumentsParser.cs rename to src/dotnet/commands/dotnet-compile-native/ArgumentsParser.cs diff --git a/src/dotnet-compile-native/DirectoryExtensions.cs b/src/dotnet/commands/dotnet-compile-native/DirectoryExtensions.cs similarity index 100% rename from src/dotnet-compile-native/DirectoryExtensions.cs rename to src/dotnet/commands/dotnet-compile-native/DirectoryExtensions.cs diff --git a/src/dotnet-compile-native/EnumExtensions.cs b/src/dotnet/commands/dotnet-compile-native/EnumExtensions.cs similarity index 100% rename from src/dotnet-compile-native/EnumExtensions.cs rename to src/dotnet/commands/dotnet-compile-native/EnumExtensions.cs diff --git a/src/dotnet-compile-native/ILCompilerInvoker.cs b/src/dotnet/commands/dotnet-compile-native/ILCompilerInvoker.cs similarity index 100% rename from src/dotnet-compile-native/ILCompilerInvoker.cs rename to src/dotnet/commands/dotnet-compile-native/ILCompilerInvoker.cs diff --git a/src/dotnet-compile-native/IntermediateCompilation/IPlatformNativeStep.cs b/src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/IPlatformNativeStep.cs similarity index 100% rename from src/dotnet-compile-native/IntermediateCompilation/IPlatformNativeStep.cs rename to src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/IPlatformNativeStep.cs diff --git a/src/dotnet-compile-native/IntermediateCompilation/IntermediateCompiler.cs b/src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/IntermediateCompiler.cs similarity index 100% rename from src/dotnet-compile-native/IntermediateCompilation/IntermediateCompiler.cs rename to src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/IntermediateCompiler.cs diff --git a/src/dotnet-compile-native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs b/src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs similarity index 100% rename from src/dotnet-compile-native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs rename to src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs diff --git a/src/dotnet-compile-native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs b/src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs similarity index 100% rename from src/dotnet-compile-native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs rename to src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs diff --git a/src/dotnet-compile-native/IntermediateCompilation/Mac/MacCppCompileStep.cs b/src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Mac/MacCppCompileStep.cs similarity index 100% rename from src/dotnet-compile-native/IntermediateCompilation/Mac/MacCppCompileStep.cs rename to src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Mac/MacCppCompileStep.cs diff --git a/src/dotnet-compile-native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs b/src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs similarity index 100% rename from src/dotnet-compile-native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs rename to src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs diff --git a/src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCommon.cs b/src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCommon.cs similarity index 100% rename from src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCommon.cs rename to src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCommon.cs diff --git a/src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs b/src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs similarity index 100% rename from src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs rename to src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs diff --git a/src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsLinkStep.cs b/src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Windows/WindowsLinkStep.cs similarity index 100% rename from src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsLinkStep.cs rename to src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Windows/WindowsLinkStep.cs diff --git a/src/dotnet-compile-native/NativeCompileSettings.cs b/src/dotnet/commands/dotnet-compile-native/NativeCompileSettings.cs similarity index 100% rename from src/dotnet-compile-native/NativeCompileSettings.cs rename to src/dotnet/commands/dotnet-compile-native/NativeCompileSettings.cs diff --git a/src/dotnet-compile-native/NativeCompiler.cs b/src/dotnet/commands/dotnet-compile-native/NativeCompiler.cs similarity index 100% rename from src/dotnet-compile-native/NativeCompiler.cs rename to src/dotnet/commands/dotnet-compile-native/NativeCompiler.cs diff --git a/src/dotnet-compile-native/Program.cs b/src/dotnet/commands/dotnet-compile-native/Program.cs similarity index 96% rename from src/dotnet-compile-native/Program.cs rename to src/dotnet/commands/dotnet-compile-native/Program.cs index 33fb7daa8..c43a289a5 100644 --- a/src/dotnet-compile-native/Program.cs +++ b/src/dotnet/commands/dotnet-compile-native/Program.cs @@ -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); diff --git a/src/dotnet-compile-native/README.md b/src/dotnet/commands/dotnet-compile-native/README.md similarity index 100% rename from src/dotnet-compile-native/README.md rename to src/dotnet/commands/dotnet-compile-native/README.md diff --git a/src/dotnet-compile-native/RuntimeExtensions.cs b/src/dotnet/commands/dotnet-compile-native/RuntimeExtensions.cs similarity index 100% rename from src/dotnet-compile-native/RuntimeExtensions.cs rename to src/dotnet/commands/dotnet-compile-native/RuntimeExtensions.cs diff --git a/src/dotnet-compile-native/RuntimeInformationExtensions.cs b/src/dotnet/commands/dotnet-compile-native/RuntimeInformationExtensions.cs similarity index 100% rename from src/dotnet-compile-native/RuntimeInformationExtensions.cs rename to src/dotnet/commands/dotnet-compile-native/RuntimeInformationExtensions.cs diff --git a/src/dotnet-compile-native/appdep/project.json b/src/dotnet/commands/dotnet-compile-native/appdep/project.json similarity index 100% rename from src/dotnet-compile-native/appdep/project.json rename to src/dotnet/commands/dotnet-compile-native/appdep/project.json diff --git a/src/dotnet-compile-native/enums/ArchitectureMode.cs b/src/dotnet/commands/dotnet-compile-native/enums/ArchitectureMode.cs similarity index 100% rename from src/dotnet-compile-native/enums/ArchitectureMode.cs rename to src/dotnet/commands/dotnet-compile-native/enums/ArchitectureMode.cs diff --git a/src/dotnet-compile-native/enums/BuildConfiguration.cs b/src/dotnet/commands/dotnet-compile-native/enums/BuildConfiguration.cs similarity index 100% rename from src/dotnet-compile-native/enums/BuildConfiguration.cs rename to src/dotnet/commands/dotnet-compile-native/enums/BuildConfiguration.cs diff --git a/src/dotnet-compile-native/enums/NativeIntermediateMode.cs b/src/dotnet/commands/dotnet-compile-native/enums/NativeIntermediateMode.cs similarity index 100% rename from src/dotnet-compile-native/enums/NativeIntermediateMode.cs rename to src/dotnet/commands/dotnet-compile-native/enums/NativeIntermediateMode.cs diff --git a/src/dotnet-compile-native/enums/OSMode.cs b/src/dotnet/commands/dotnet-compile-native/enums/OSMode.cs similarity index 100% rename from src/dotnet-compile-native/enums/OSMode.cs rename to src/dotnet/commands/dotnet-compile-native/enums/OSMode.cs diff --git a/src/dotnet-compile/CanonicalError.cs b/src/dotnet/commands/dotnet-compile/CanonicalError.cs similarity index 100% rename from src/dotnet-compile/CanonicalError.cs rename to src/dotnet/commands/dotnet-compile/CanonicalError.cs diff --git a/src/dotnet-compile/CompilerCommandApp.cs b/src/dotnet/commands/dotnet-compile/CompilerCommandApp.cs similarity index 100% rename from src/dotnet-compile/CompilerCommandApp.cs rename to src/dotnet/commands/dotnet-compile/CompilerCommandApp.cs diff --git a/src/dotnet-compile/CompilerUtil.cs b/src/dotnet/commands/dotnet-compile/CompilerUtil.cs similarity index 99% rename from src/dotnet-compile/CompilerUtil.cs rename to src/dotnet/commands/dotnet-compile/CompilerUtil.cs index e4843aae0..6f888a916 100644 --- a/src/dotnet-compile/CompilerUtil.cs +++ b/src/dotnet/commands/dotnet-compile/CompilerUtil.cs @@ -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 GetCommandsInvokedByCompile(ProjectContext project) { - return new List {ResolveCompilerName(project), "dotnet-compile"}; + return new List {ResolveCompilerName(project), "compile"}; } } } \ No newline at end of file diff --git a/src/dotnet-compile/Program.cs b/src/dotnet/commands/dotnet-compile/Program.cs similarity index 97% rename from src/dotnet-compile/Program.cs rename to src/dotnet/commands/dotnet-compile/Program.cs index 71aba04ca..a23664ff2 100644 --- a/src/dotnet-compile/Program.cs +++ b/src/dotnet/commands/dotnet-compile/Program.cs @@ -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(); diff --git a/src/dotnet-compile/README.md b/src/dotnet/commands/dotnet-compile/README.md similarity index 100% rename from src/dotnet-compile/README.md rename to src/dotnet/commands/dotnet-compile/README.md diff --git a/src/dotnet-compile/ResourceManifestName.cs b/src/dotnet/commands/dotnet-compile/ResourceManifestName.cs similarity index 100% rename from src/dotnet-compile/ResourceManifestName.cs rename to src/dotnet/commands/dotnet-compile/ResourceManifestName.cs diff --git a/src/dotnet-new/CSharp_Console/NuGet.Config b/src/dotnet/commands/dotnet-new/CSharp_Console/NuGet.Config similarity index 100% rename from src/dotnet-new/CSharp_Console/NuGet.Config rename to src/dotnet/commands/dotnet-new/CSharp_Console/NuGet.Config diff --git a/src/dotnet-new/CSharp_Console/Program.cs b/src/dotnet/commands/dotnet-new/CSharp_Console/Program.cs similarity index 100% rename from src/dotnet-new/CSharp_Console/Program.cs rename to src/dotnet/commands/dotnet-new/CSharp_Console/Program.cs diff --git a/src/dotnet-new/CSharp_Console/project.json b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json similarity index 100% rename from src/dotnet-new/CSharp_Console/project.json rename to src/dotnet/commands/dotnet-new/CSharp_Console/project.json diff --git a/src/dotnet-new/FSharp_Console/NuGet.Config b/src/dotnet/commands/dotnet-new/FSharp_Console/NuGet.Config similarity index 100% rename from src/dotnet-new/FSharp_Console/NuGet.Config rename to src/dotnet/commands/dotnet-new/FSharp_Console/NuGet.Config diff --git a/src/dotnet-new/FSharp_Console/Program.fs b/src/dotnet/commands/dotnet-new/FSharp_Console/Program.fs similarity index 100% rename from src/dotnet-new/FSharp_Console/Program.fs rename to src/dotnet/commands/dotnet-new/FSharp_Console/Program.fs diff --git a/src/dotnet-new/FSharp_Console/project.json b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json similarity index 100% rename from src/dotnet-new/FSharp_Console/project.json rename to src/dotnet/commands/dotnet-new/FSharp_Console/project.json diff --git a/src/dotnet-new/Program.cs b/src/dotnet/commands/dotnet-new/Program.cs similarity index 95% rename from src/dotnet-new/Program.cs rename to src/dotnet/commands/dotnet-new/Program.cs index e37d216bf..c1cf749a1 100644 --- a/src/dotnet-new/Program.cs +++ b/src/dotnet/commands/dotnet-new/Program.cs @@ -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 of project [C#|F#]", CommandOptionType.SingleValue); var type = app.Option("-t|--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" } }; diff --git a/src/dotnet-new/README.md b/src/dotnet/commands/dotnet-new/README.md similarity index 100% rename from src/dotnet-new/README.md rename to src/dotnet/commands/dotnet-new/README.md diff --git a/src/dotnet-pack/ArtifactPathsCalculator.cs b/src/dotnet/commands/dotnet-pack/ArtifactPathsCalculator.cs similarity index 100% rename from src/dotnet-pack/ArtifactPathsCalculator.cs rename to src/dotnet/commands/dotnet-pack/ArtifactPathsCalculator.cs diff --git a/src/dotnet-pack/BuildProjectCommand.cs b/src/dotnet/commands/dotnet-pack/BuildProjectCommand.cs similarity index 96% rename from src/dotnet-pack/BuildProjectCommand.cs rename to src/dotnet/commands/dotnet-pack/BuildProjectCommand.cs index 801eca259..d14f07f16 100644 --- a/src/dotnet-pack/BuildProjectCommand.cs +++ b/src/dotnet/commands/dotnet-pack/BuildProjectCommand.cs @@ -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(); diff --git a/src/dotnet-pack/NuGet/Constants.cs b/src/dotnet/commands/dotnet-pack/NuGet/Constants.cs similarity index 100% rename from src/dotnet-pack/NuGet/Constants.cs rename to src/dotnet/commands/dotnet-pack/NuGet/Constants.cs diff --git a/src/dotnet-pack/NuGet/EmptyFrameworkFolderFile.cs b/src/dotnet/commands/dotnet-pack/NuGet/EmptyFrameworkFolderFile.cs similarity index 100% rename from src/dotnet-pack/NuGet/EmptyFrameworkFolderFile.cs rename to src/dotnet/commands/dotnet-pack/NuGet/EmptyFrameworkFolderFile.cs diff --git a/src/dotnet-pack/NuGet/FrameworkAssemblyReference.cs b/src/dotnet/commands/dotnet-pack/NuGet/FrameworkAssemblyReference.cs similarity index 100% rename from src/dotnet-pack/NuGet/FrameworkAssemblyReference.cs rename to src/dotnet/commands/dotnet-pack/NuGet/FrameworkAssemblyReference.cs diff --git a/src/dotnet-pack/NuGet/IPackageFile.cs b/src/dotnet/commands/dotnet-pack/NuGet/IPackageFile.cs similarity index 100% rename from src/dotnet-pack/NuGet/IPackageFile.cs rename to src/dotnet/commands/dotnet-pack/NuGet/IPackageFile.cs diff --git a/src/dotnet-pack/NuGet/Manifest.cs b/src/dotnet/commands/dotnet-pack/NuGet/Manifest.cs similarity index 100% rename from src/dotnet-pack/NuGet/Manifest.cs rename to src/dotnet/commands/dotnet-pack/NuGet/Manifest.cs diff --git a/src/dotnet-pack/NuGet/ManifestContentFiles.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestContentFiles.cs similarity index 100% rename from src/dotnet-pack/NuGet/ManifestContentFiles.cs rename to src/dotnet/commands/dotnet-pack/NuGet/ManifestContentFiles.cs diff --git a/src/dotnet-pack/NuGet/ManifestFile.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestFile.cs similarity index 100% rename from src/dotnet-pack/NuGet/ManifestFile.cs rename to src/dotnet/commands/dotnet-pack/NuGet/ManifestFile.cs diff --git a/src/dotnet-pack/NuGet/ManifestMetadata.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestMetadata.cs similarity index 100% rename from src/dotnet-pack/NuGet/ManifestMetadata.cs rename to src/dotnet/commands/dotnet-pack/NuGet/ManifestMetadata.cs diff --git a/src/dotnet-pack/NuGet/ManifestReader.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestReader.cs similarity index 100% rename from src/dotnet-pack/NuGet/ManifestReader.cs rename to src/dotnet/commands/dotnet-pack/NuGet/ManifestReader.cs diff --git a/src/dotnet-pack/NuGet/ManifestSchemaUtility.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs similarity index 100% rename from src/dotnet-pack/NuGet/ManifestSchemaUtility.cs rename to src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs diff --git a/src/dotnet-pack/NuGet/ManifestVersionAttribute.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionAttribute.cs similarity index 100% rename from src/dotnet-pack/NuGet/ManifestVersionAttribute.cs rename to src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionAttribute.cs diff --git a/src/dotnet-pack/NuGet/ManifestVersionUtility.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs similarity index 100% rename from src/dotnet-pack/NuGet/ManifestVersionUtility.cs rename to src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs diff --git a/src/dotnet-pack/NuGet/PackageBuilder.cs b/src/dotnet/commands/dotnet-pack/NuGet/PackageBuilder.cs similarity index 100% rename from src/dotnet-pack/NuGet/PackageBuilder.cs rename to src/dotnet/commands/dotnet-pack/NuGet/PackageBuilder.cs diff --git a/src/dotnet-pack/NuGet/PackageDependencySet.cs b/src/dotnet/commands/dotnet-pack/NuGet/PackageDependencySet.cs similarity index 100% rename from src/dotnet-pack/NuGet/PackageDependencySet.cs rename to src/dotnet/commands/dotnet-pack/NuGet/PackageDependencySet.cs diff --git a/src/dotnet-pack/NuGet/PackageIdValidator.cs b/src/dotnet/commands/dotnet-pack/NuGet/PackageIdValidator.cs similarity index 100% rename from src/dotnet-pack/NuGet/PackageIdValidator.cs rename to src/dotnet/commands/dotnet-pack/NuGet/PackageIdValidator.cs diff --git a/src/dotnet-pack/NuGet/PackageMetadataXmlExtensions.cs b/src/dotnet/commands/dotnet-pack/NuGet/PackageMetadataXmlExtensions.cs similarity index 100% rename from src/dotnet-pack/NuGet/PackageMetadataXmlExtensions.cs rename to src/dotnet/commands/dotnet-pack/NuGet/PackageMetadataXmlExtensions.cs diff --git a/src/dotnet-pack/NuGet/PackageReferenceSet.cs b/src/dotnet/commands/dotnet-pack/NuGet/PackageReferenceSet.cs similarity index 100% rename from src/dotnet-pack/NuGet/PackageReferenceSet.cs rename to src/dotnet/commands/dotnet-pack/NuGet/PackageReferenceSet.cs diff --git a/src/dotnet-pack/NuGet/PathResolver.cs b/src/dotnet/commands/dotnet-pack/NuGet/PathResolver.cs similarity index 100% rename from src/dotnet-pack/NuGet/PathResolver.cs rename to src/dotnet/commands/dotnet-pack/NuGet/PathResolver.cs diff --git a/src/dotnet-pack/NuGet/PathUtility.cs b/src/dotnet/commands/dotnet-pack/NuGet/PathUtility.cs similarity index 100% rename from src/dotnet-pack/NuGet/PathUtility.cs rename to src/dotnet/commands/dotnet-pack/NuGet/PathUtility.cs diff --git a/src/dotnet-pack/NuGet/PhysicalPackageFile.cs b/src/dotnet/commands/dotnet-pack/NuGet/PhysicalPackageFile.cs similarity index 100% rename from src/dotnet-pack/NuGet/PhysicalPackageFile.cs rename to src/dotnet/commands/dotnet-pack/NuGet/PhysicalPackageFile.cs diff --git a/src/dotnet-pack/PackageGenerator.cs b/src/dotnet/commands/dotnet-pack/PackageGenerator.cs similarity index 100% rename from src/dotnet-pack/PackageGenerator.cs rename to src/dotnet/commands/dotnet-pack/PackageGenerator.cs diff --git a/src/dotnet-pack/PackagesGenerator.cs b/src/dotnet/commands/dotnet-pack/PackagesGenerator.cs similarity index 100% rename from src/dotnet-pack/PackagesGenerator.cs rename to src/dotnet/commands/dotnet-pack/PackagesGenerator.cs diff --git a/src/dotnet-pack/Program.cs b/src/dotnet/commands/dotnet-pack/Program.cs similarity index 98% rename from src/dotnet-pack/Program.cs rename to src/dotnet/commands/dotnet-pack/Program.cs index 1b39b2e72..119371dcd 100644 --- a/src/dotnet-pack/Program.cs +++ b/src/dotnet/commands/dotnet-pack/Program.cs @@ -11,9 +11,9 @@ using Microsoft.DotNet.Tools.Pack; namespace Microsoft.DotNet.Tools.Compiler { - public class Program + public class PackCommand { - public static int Main(string[] args) + public static int Run(string[] args) { DebugHelper.HandleDebugSwitch(ref args); diff --git a/src/dotnet-pack/Properties/launchSettings.json b/src/dotnet/commands/dotnet-pack/Properties/launchSettings.json similarity index 100% rename from src/dotnet-pack/Properties/launchSettings.json rename to src/dotnet/commands/dotnet-pack/Properties/launchSettings.json diff --git a/src/dotnet-pack/SymbolPackageGenerator.cs b/src/dotnet/commands/dotnet-pack/SymbolPackageGenerator.cs similarity index 100% rename from src/dotnet-pack/SymbolPackageGenerator.cs rename to src/dotnet/commands/dotnet-pack/SymbolPackageGenerator.cs diff --git a/src/dotnet-projectmodel-server/ConnectionContext.cs b/src/dotnet/commands/dotnet-projectmodel-server/ConnectionContext.cs similarity index 100% rename from src/dotnet-projectmodel-server/ConnectionContext.cs rename to src/dotnet/commands/dotnet-projectmodel-server/ConnectionContext.cs diff --git a/src/dotnet-projectmodel-server/Helpers/DependencyTypeChangeFinder.cs b/src/dotnet/commands/dotnet-projectmodel-server/Helpers/DependencyTypeChangeFinder.cs similarity index 100% rename from src/dotnet-projectmodel-server/Helpers/DependencyTypeChangeFinder.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Helpers/DependencyTypeChangeFinder.cs diff --git a/src/dotnet-projectmodel-server/Helpers/JTokenExtensions.cs b/src/dotnet/commands/dotnet-projectmodel-server/Helpers/JTokenExtensions.cs similarity index 100% rename from src/dotnet-projectmodel-server/Helpers/JTokenExtensions.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Helpers/JTokenExtensions.cs diff --git a/src/dotnet-projectmodel-server/Helpers/LibraryExtensions.cs b/src/dotnet/commands/dotnet-projectmodel-server/Helpers/LibraryExtensions.cs similarity index 100% rename from src/dotnet-projectmodel-server/Helpers/LibraryExtensions.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Helpers/LibraryExtensions.cs diff --git a/src/dotnet-projectmodel-server/Helpers/NuGetFrameworkExtensions.cs b/src/dotnet/commands/dotnet-projectmodel-server/Helpers/NuGetFrameworkExtensions.cs similarity index 100% rename from src/dotnet-projectmodel-server/Helpers/NuGetFrameworkExtensions.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Helpers/NuGetFrameworkExtensions.cs diff --git a/src/dotnet-projectmodel-server/Helpers/ProjectExtensions.cs b/src/dotnet/commands/dotnet-projectmodel-server/Helpers/ProjectExtensions.cs similarity index 100% rename from src/dotnet-projectmodel-server/Helpers/ProjectExtensions.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Helpers/ProjectExtensions.cs diff --git a/src/dotnet-projectmodel-server/InternalModels/ProjectContextSnapshot.cs b/src/dotnet/commands/dotnet-projectmodel-server/InternalModels/ProjectContextSnapshot.cs similarity index 100% rename from src/dotnet-projectmodel-server/InternalModels/ProjectContextSnapshot.cs rename to src/dotnet/commands/dotnet-projectmodel-server/InternalModels/ProjectContextSnapshot.cs diff --git a/src/dotnet-projectmodel-server/InternalModels/ProjectSnapshot.cs b/src/dotnet/commands/dotnet-projectmodel-server/InternalModels/ProjectSnapshot.cs similarity index 100% rename from src/dotnet-projectmodel-server/InternalModels/ProjectSnapshot.cs rename to src/dotnet/commands/dotnet-projectmodel-server/InternalModels/ProjectSnapshot.cs diff --git a/src/dotnet-projectmodel-server/MessageTypes.cs b/src/dotnet/commands/dotnet-projectmodel-server/MessageTypes.cs similarity index 100% rename from src/dotnet-projectmodel-server/MessageTypes.cs rename to src/dotnet/commands/dotnet-projectmodel-server/MessageTypes.cs diff --git a/src/dotnet-projectmodel-server/Messengers/CompilerOptionsMessenger.cs b/src/dotnet/commands/dotnet-projectmodel-server/Messengers/CompilerOptionsMessenger.cs similarity index 100% rename from src/dotnet-projectmodel-server/Messengers/CompilerOptionsMessenger.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Messengers/CompilerOptionsMessenger.cs diff --git a/src/dotnet-projectmodel-server/Messengers/DependenciesMessenger.cs b/src/dotnet/commands/dotnet-projectmodel-server/Messengers/DependenciesMessenger.cs similarity index 100% rename from src/dotnet-projectmodel-server/Messengers/DependenciesMessenger.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Messengers/DependenciesMessenger.cs diff --git a/src/dotnet-projectmodel-server/Messengers/DependencyDiagnosticsMessenger.cs b/src/dotnet/commands/dotnet-projectmodel-server/Messengers/DependencyDiagnosticsMessenger.cs similarity index 100% rename from src/dotnet-projectmodel-server/Messengers/DependencyDiagnosticsMessenger.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Messengers/DependencyDiagnosticsMessenger.cs diff --git a/src/dotnet-projectmodel-server/Messengers/GlobalErrorMessenger.cs b/src/dotnet/commands/dotnet-projectmodel-server/Messengers/GlobalErrorMessenger.cs similarity index 100% rename from src/dotnet-projectmodel-server/Messengers/GlobalErrorMessenger.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Messengers/GlobalErrorMessenger.cs diff --git a/src/dotnet-projectmodel-server/Messengers/Messenger.cs b/src/dotnet/commands/dotnet-projectmodel-server/Messengers/Messenger.cs similarity index 100% rename from src/dotnet-projectmodel-server/Messengers/Messenger.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Messengers/Messenger.cs diff --git a/src/dotnet-projectmodel-server/Messengers/ProjectDiagnosticsMessenger.cs b/src/dotnet/commands/dotnet-projectmodel-server/Messengers/ProjectDiagnosticsMessenger.cs similarity index 100% rename from src/dotnet-projectmodel-server/Messengers/ProjectDiagnosticsMessenger.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Messengers/ProjectDiagnosticsMessenger.cs diff --git a/src/dotnet-projectmodel-server/Messengers/ProjectInformationMessenger.cs b/src/dotnet/commands/dotnet-projectmodel-server/Messengers/ProjectInformationMessenger.cs similarity index 100% rename from src/dotnet-projectmodel-server/Messengers/ProjectInformationMessenger.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Messengers/ProjectInformationMessenger.cs diff --git a/src/dotnet-projectmodel-server/Messengers/ReferencesMessenger.cs b/src/dotnet/commands/dotnet-projectmodel-server/Messengers/ReferencesMessenger.cs similarity index 100% rename from src/dotnet-projectmodel-server/Messengers/ReferencesMessenger.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Messengers/ReferencesMessenger.cs diff --git a/src/dotnet-projectmodel-server/Messengers/SourcesMessenger.cs b/src/dotnet/commands/dotnet-projectmodel-server/Messengers/SourcesMessenger.cs similarity index 100% rename from src/dotnet-projectmodel-server/Messengers/SourcesMessenger.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Messengers/SourcesMessenger.cs diff --git a/src/dotnet-projectmodel-server/Models/DependencyDescription.cs b/src/dotnet/commands/dotnet-projectmodel-server/Models/DependencyDescription.cs similarity index 100% rename from src/dotnet-projectmodel-server/Models/DependencyDescription.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Models/DependencyDescription.cs diff --git a/src/dotnet-projectmodel-server/Models/DependencyItem.cs b/src/dotnet/commands/dotnet-projectmodel-server/Models/DependencyItem.cs similarity index 100% rename from src/dotnet-projectmodel-server/Models/DependencyItem.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Models/DependencyItem.cs diff --git a/src/dotnet-projectmodel-server/Models/DiagnosticMessageGroup.cs b/src/dotnet/commands/dotnet-projectmodel-server/Models/DiagnosticMessageGroup.cs similarity index 100% rename from src/dotnet-projectmodel-server/Models/DiagnosticMessageGroup.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Models/DiagnosticMessageGroup.cs diff --git a/src/dotnet-projectmodel-server/Models/DiagnosticMessageView.cs b/src/dotnet/commands/dotnet-projectmodel-server/Models/DiagnosticMessageView.cs similarity index 100% rename from src/dotnet-projectmodel-server/Models/DiagnosticMessageView.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Models/DiagnosticMessageView.cs diff --git a/src/dotnet-projectmodel-server/Models/DiagnosticsListMessage.cs b/src/dotnet/commands/dotnet-projectmodel-server/Models/DiagnosticsListMessage.cs similarity index 100% rename from src/dotnet-projectmodel-server/Models/DiagnosticsListMessage.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Models/DiagnosticsListMessage.cs diff --git a/src/dotnet-projectmodel-server/Models/ErrorMessage.cs b/src/dotnet/commands/dotnet-projectmodel-server/Models/ErrorMessage.cs similarity index 100% rename from src/dotnet-projectmodel-server/Models/ErrorMessage.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Models/ErrorMessage.cs diff --git a/src/dotnet-projectmodel-server/Models/FrameworkData.cs b/src/dotnet/commands/dotnet-projectmodel-server/Models/FrameworkData.cs similarity index 100% rename from src/dotnet-projectmodel-server/Models/FrameworkData.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Models/FrameworkData.cs diff --git a/src/dotnet-projectmodel-server/Models/Message.cs b/src/dotnet/commands/dotnet-projectmodel-server/Models/Message.cs similarity index 100% rename from src/dotnet-projectmodel-server/Models/Message.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Models/Message.cs diff --git a/src/dotnet-projectmodel-server/Models/ProjectReferenceDescription.cs b/src/dotnet/commands/dotnet-projectmodel-server/Models/ProjectReferenceDescription.cs similarity index 100% rename from src/dotnet-projectmodel-server/Models/ProjectReferenceDescription.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Models/ProjectReferenceDescription.cs diff --git a/src/dotnet-projectmodel-server/ProcessingQueue.cs b/src/dotnet/commands/dotnet-projectmodel-server/ProcessingQueue.cs similarity index 100% rename from src/dotnet-projectmodel-server/ProcessingQueue.cs rename to src/dotnet/commands/dotnet-projectmodel-server/ProcessingQueue.cs diff --git a/src/dotnet-projectmodel-server/Program.cs b/src/dotnet/commands/dotnet-projectmodel-server/Program.cs similarity index 93% rename from src/dotnet-projectmodel-server/Program.cs rename to src/dotnet/commands/dotnet-projectmodel-server/Program.cs index be9d23ca7..f4603eaaf 100644 --- a/src/dotnet-projectmodel-server/Program.cs +++ b/src/dotnet/commands/dotnet-projectmodel-server/Program.cs @@ -10,7 +10,7 @@ using Microsoft.Extensions.Logging; namespace Microsoft.DotNet.ProjectModel.Server { - public class Program + public class ProjectModelServerCommand { private readonly Dictionary _projects; private readonly WorkspaceContext _workspaceContext; @@ -20,7 +20,7 @@ namespace Microsoft.DotNet.ProjectModel.Server private readonly int _port; private Socket _listenSocket; - public Program(int port, string hostName, ILoggerFactory loggerFactory) + public ProjectModelServerCommand(int port, string hostName, ILoggerFactory loggerFactory) { _port = port; _hostName = hostName; @@ -30,7 +30,7 @@ namespace Microsoft.DotNet.ProjectModel.Server _projects = new Dictionary(); } - public static int Main(string[] args) + public static int Run(string[] args) { var app = new CommandLineApplication(); app.Name = "dotnet-projectmodel-server"; @@ -49,7 +49,7 @@ namespace Microsoft.DotNet.ProjectModel.Server var loggerFactory = new LoggerFactory(); loggerFactory.AddConsole(verbose.HasValue() ? LogLevel.Debug : LogLevel.Information); - var logger = loggerFactory.CreateLogger(); + var logger = loggerFactory.CreateLogger(); if (!MonitorHostProcess(hostpid, logger)) { @@ -68,7 +68,7 @@ namespace Microsoft.DotNet.ProjectModel.Server return 1; } - var program = new Program(intPort, hostname.Value(), loggerFactory); + var program = new ProjectModelServerCommand(intPort, hostname.Value(), loggerFactory); program.OpenChannel(); return 0; diff --git a/src/dotnet-projectmodel-server/ProjectManager.cs b/src/dotnet/commands/dotnet-projectmodel-server/ProjectManager.cs similarity index 100% rename from src/dotnet-projectmodel-server/ProjectManager.cs rename to src/dotnet/commands/dotnet-projectmodel-server/ProjectManager.cs diff --git a/src/dotnet-projectmodel-server/ProtocolManager.cs b/src/dotnet/commands/dotnet-projectmodel-server/ProtocolManager.cs similarity index 100% rename from src/dotnet-projectmodel-server/ProtocolManager.cs rename to src/dotnet/commands/dotnet-projectmodel-server/ProtocolManager.cs diff --git a/src/dotnet-publish/Program.cs b/src/dotnet/commands/dotnet-publish/Program.cs similarity index 97% rename from src/dotnet-publish/Program.cs rename to src/dotnet/commands/dotnet-publish/Program.cs index 72aabd21a..0d63fc6ad 100644 --- a/src/dotnet-publish/Program.cs +++ b/src/dotnet/commands/dotnet-publish/Program.cs @@ -8,9 +8,9 @@ using System.IO; namespace Microsoft.DotNet.Tools.Publish { - public class Program + public partial class PublishCommand { - public static int Main(string[] args) + public static int Run(string[] args) { DebugHelper.HandleDebugSwitch(ref args); diff --git a/src/dotnet-publish/PublishCommand.cs b/src/dotnet/commands/dotnet-publish/PublishCommand.cs similarity index 99% rename from src/dotnet-publish/PublishCommand.cs rename to src/dotnet/commands/dotnet-publish/PublishCommand.cs index 562f4c11e..378e70884 100644 --- a/src/dotnet-publish/PublishCommand.cs +++ b/src/dotnet/commands/dotnet-publish/PublishCommand.cs @@ -15,7 +15,7 @@ using Microsoft.DotNet.ProjectModel.Utilities; namespace Microsoft.DotNet.Tools.Publish { - public class PublishCommand + public partial class PublishCommand { public string ProjectPath { get; set; } public string Configuration { get; set; } @@ -105,7 +105,7 @@ namespace Microsoft.DotNet.Tools.Publish } // Compile the project (and transitively, all it's dependencies) - var result = Command.Create("dotnet-build", + var result = Command.CreateDotNet("build", new string[] { "--framework", $"{context.TargetFramework.DotNetFrameworkName}", diff --git a/src/dotnet-publish/README.md b/src/dotnet/commands/dotnet-publish/README.md similarity index 100% rename from src/dotnet-publish/README.md rename to src/dotnet/commands/dotnet-publish/README.md diff --git a/src/dotnet-repl-csi/Program.cs b/src/dotnet/commands/dotnet-repl-csi/Program.cs similarity index 98% rename from src/dotnet-repl-csi/Program.cs rename to src/dotnet/commands/dotnet-repl-csi/Program.cs index 28ab52561..5375b0c0d 100644 --- a/src/dotnet-repl-csi/Program.cs +++ b/src/dotnet/commands/dotnet-repl-csi/Program.cs @@ -12,9 +12,9 @@ using NuGet.Frameworks; namespace Microsoft.DotNet.Tools.Repl.Csi { - public sealed class Program + public sealed class ReplCsiCommand { - public static int Main(string[] args) + public static int Run(string[] args) { DebugHelper.HandleDebugSwitch(ref args); @@ -59,7 +59,7 @@ namespace Microsoft.DotNet.Tools.Repl.Csi Reporter.Output.WriteLine($"Compiling {projectContext.RootProject.Identity.Name.Yellow()} for {projectContext.TargetFramework.DotNetFrameworkName.Yellow()} to use with the {"C# REPL".Yellow()} environment."); // --temp-output is actually the intermediate output folder and can be the same as --output for our temporary compilation (`dotnet run` can be seen doing the same) - return Command.Create($"dotnet-build", new [] + return Command.CreateDotNet($"build", new [] { $"--output", $"{tempOutputDir}", diff --git a/src/dotnet-repl/Program.cs b/src/dotnet/commands/dotnet-repl/Program.cs similarity index 94% rename from src/dotnet-repl/Program.cs rename to src/dotnet/commands/dotnet-repl/Program.cs index 58ee8f16a..aed67a969 100644 --- a/src/dotnet-repl/Program.cs +++ b/src/dotnet/commands/dotnet-repl/Program.cs @@ -8,7 +8,7 @@ using Microsoft.DotNet.Cli.Utils; namespace Microsoft.DotNet.Tools.Repl { - public sealed class Program + public partial class ReplCommand { private const string DefaultReplLanguage = "csharp"; @@ -29,7 +29,7 @@ Options: -h|--help Show help information "; - public static int Main(string[] args) + public static int Run(string[] args) { DebugHelper.HandleDebugSwitch(ref args); @@ -80,7 +80,7 @@ Options: remainingArguments.Add("--help"); } - return Command.Create($"dotnet-repl-{replName}", remainingArguments) + return Command.CreateDotNet($"repl-{replName}", remainingArguments) .ForwardStdOut() .ForwardStdErr() .Execute() diff --git a/src/dotnet-resgen/Program.cs b/src/dotnet/commands/dotnet-resgen/Program.cs similarity index 98% rename from src/dotnet-resgen/Program.cs rename to src/dotnet/commands/dotnet-resgen/Program.cs index 65032267f..a1263a093 100644 --- a/src/dotnet-resgen/Program.cs +++ b/src/dotnet/commands/dotnet-resgen/Program.cs @@ -10,9 +10,9 @@ using Microsoft.DotNet.Cli.Utils; namespace Microsoft.DotNet.Tools.Resgen { - public class Program + public partial class ResgenCommand { - public static int Main(string[] args) + public static int Run(string[] args) { DebugHelper.HandleDebugSwitch(ref args); diff --git a/src/dotnet-resgen/ResourceAssemblyGenerator.cs b/src/dotnet/commands/dotnet-resgen/ResourceAssemblyGenerator.cs similarity index 100% rename from src/dotnet-resgen/ResourceAssemblyGenerator.cs rename to src/dotnet/commands/dotnet-resgen/ResourceAssemblyGenerator.cs diff --git a/src/dotnet-resgen/ResourceFile.cs b/src/dotnet/commands/dotnet-resgen/ResourceFile.cs similarity index 100% rename from src/dotnet-resgen/ResourceFile.cs rename to src/dotnet/commands/dotnet-resgen/ResourceFile.cs diff --git a/src/dotnet-resgen/ResourceFileType.cs b/src/dotnet/commands/dotnet-resgen/ResourceFileType.cs similarity index 100% rename from src/dotnet-resgen/ResourceFileType.cs rename to src/dotnet/commands/dotnet-resgen/ResourceFileType.cs diff --git a/src/dotnet-resgen/ResourceSource.cs b/src/dotnet/commands/dotnet-resgen/ResourceSource.cs similarity index 100% rename from src/dotnet-resgen/ResourceSource.cs rename to src/dotnet/commands/dotnet-resgen/ResourceSource.cs diff --git a/src/dotnet-resgen/ResourcesFileGenerator.cs b/src/dotnet/commands/dotnet-resgen/ResourcesFileGenerator.cs similarity index 100% rename from src/dotnet-resgen/ResourcesFileGenerator.cs rename to src/dotnet/commands/dotnet-resgen/ResourcesFileGenerator.cs diff --git a/src/dotnet-restore/NuGet3.cs b/src/dotnet/commands/dotnet-restore/NuGet3.cs similarity index 100% rename from src/dotnet-restore/NuGet3.cs rename to src/dotnet/commands/dotnet-restore/NuGet3.cs diff --git a/src/dotnet-restore/Program.cs b/src/dotnet/commands/dotnet-restore/Program.cs similarity index 98% rename from src/dotnet-restore/Program.cs rename to src/dotnet/commands/dotnet-restore/Program.cs index 5c9583c44..f5fb95dea 100644 --- a/src/dotnet-restore/Program.cs +++ b/src/dotnet/commands/dotnet-restore/Program.cs @@ -17,12 +17,12 @@ using Microsoft.Extensions.PlatformAbstractions; namespace Microsoft.DotNet.Tools.Restore { - public class Program + public partial class RestoreCommand { private static readonly string DefaultRid = PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier(); - public static int Main(string[] args) + public static int Run(string[] args) { DebugHelper.HandleDebugSwitch(ref args); diff --git a/src/dotnet-restore/RestoreTask.cs b/src/dotnet/commands/dotnet-restore/RestoreTask.cs similarity index 100% rename from src/dotnet-restore/RestoreTask.cs rename to src/dotnet/commands/dotnet-restore/RestoreTask.cs diff --git a/src/dotnet-run/Program.cs b/src/dotnet/commands/dotnet-run/Program.cs similarity index 96% rename from src/dotnet-run/Program.cs rename to src/dotnet/commands/dotnet-run/Program.cs index e8f3ff7bc..390943002 100644 --- a/src/dotnet-run/Program.cs +++ b/src/dotnet/commands/dotnet-run/Program.cs @@ -7,9 +7,9 @@ using System.CommandLine; namespace Microsoft.DotNet.Tools.Run { - public class Program + public partial class RunCommand { - public static int Main(string[] args) + public static int Run(string[] args) { DebugHelper.HandleDebugSwitch(ref args); diff --git a/src/dotnet-run/README.md b/src/dotnet/commands/dotnet-run/README.md similarity index 100% rename from src/dotnet-run/README.md rename to src/dotnet/commands/dotnet-run/README.md diff --git a/src/dotnet-run/RunCommand.cs b/src/dotnet/commands/dotnet-run/RunCommand.cs similarity index 96% rename from src/dotnet-run/RunCommand.cs rename to src/dotnet/commands/dotnet-run/RunCommand.cs index 01f2d5f15..fcdd743d1 100644 --- a/src/dotnet-run/RunCommand.cs +++ b/src/dotnet/commands/dotnet-run/RunCommand.cs @@ -12,7 +12,7 @@ using NuGet.Frameworks; namespace Microsoft.DotNet.Tools.Run { - public class RunCommand + public partial class RunCommand { public string Framework = null; public string Configuration = null; @@ -90,7 +90,7 @@ namespace Microsoft.DotNet.Tools.Run var tempDir = Path.Combine(_context.ProjectDirectory, "bin", ".dotnetrun", Guid.NewGuid().ToString("N")); // Compile to that directory - var result = Command.Create($"dotnet-build", new [] + var result = Command.CreateDotNet($"build", new [] { $"--output", $"{tempDir}", @@ -161,7 +161,7 @@ namespace Microsoft.DotNet.Tools.Run private static int RunInteractive(string scriptName) { - var command = Command.Create($"dotnet-repl-csi", new [] {scriptName}) + var command = Command.CreateDotNet($"repl-csi", new [] {scriptName}) .ForwardStdOut() .ForwardStdErr(); var result = command.Execute(); diff --git a/src/dotnet-test/Program.cs b/src/dotnet/commands/dotnet-test/Program.cs similarity index 96% rename from src/dotnet-test/Program.cs rename to src/dotnet/commands/dotnet-test/Program.cs index 697acda48..412d74d27 100644 --- a/src/dotnet-test/Program.cs +++ b/src/dotnet/commands/dotnet-test/Program.cs @@ -16,9 +16,9 @@ using NuGet.Frameworks; namespace Microsoft.DotNet.Tools.Test { - public class Program + public class TestCommand { - public static int Main(string[] args) + public static int Run(string[] args) { DebugHelper.HandleDebugSwitch(ref args); @@ -95,7 +95,7 @@ namespace Microsoft.DotNet.Tools.Test var commandArgs = new List { projectContext.GetOutputPathCalculator().GetAssemblyPath(Constants.DefaultConfiguration) }; commandArgs.AddRange(app.RemainingArguments); - return Command.Create($"{GetCommandName(testRunner)}", commandArgs, projectContext.TargetFramework) + return Command.CreateDotNet($"{GetCommandName(testRunner)}", commandArgs, projectContext.TargetFramework) .ForwardStdErr() .ForwardStdOut() .Execute() @@ -233,7 +233,7 @@ namespace Microsoft.DotNet.Tools.Test private static void ExecuteRunnerCommand(string testRunner, ReportingChannel channel, List commandArgs) { - var result = Command.Create(GetCommandName(testRunner), commandArgs, new NuGetFramework("DNXCore", Version.Parse("5.0"))) + var result = Command.CreateDotNet(GetCommandName(testRunner), commandArgs, new NuGetFramework("DNXCore", Version.Parse("5.0"))) .OnOutputLine(line => { try @@ -255,7 +255,7 @@ namespace Microsoft.DotNet.Tools.Test private static string GetCommandName(string testRunner) { - return $"dotnet-test-{testRunner}"; + return $"test-{testRunner}"; } private static void RegisterForParentProcessExit(int id) diff --git a/src/dotnet-test/ReportingChannel.cs b/src/dotnet/commands/dotnet-test/ReportingChannel.cs similarity index 100% rename from src/dotnet-test/ReportingChannel.cs rename to src/dotnet/commands/dotnet-test/ReportingChannel.cs diff --git a/src/dotnet-test/TestHostTracing.cs b/src/dotnet/commands/dotnet-test/TestHostTracing.cs similarity index 100% rename from src/dotnet-test/TestHostTracing.cs rename to src/dotnet/commands/dotnet-test/TestHostTracing.cs diff --git a/src/dotnet-test/dotnet-test.xproj b/src/dotnet/commands/dotnet-test/dotnet-test.xproj similarity index 100% rename from src/dotnet-test/dotnet-test.xproj rename to src/dotnet/commands/dotnet-test/dotnet-test.xproj diff --git a/src/dotnet/project.json b/src/dotnet/project.json index dda120671..864bfa7f7 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -3,14 +3,65 @@ "compilationOptions": { "emitEntryPoint": true }, + "compileExclude": [ + "commands/dotnet-new/CSharp_Console/**", + "commands/dotnet-new/FSharp_Console/**" + ], + "resource": [ + "commands/dotnet-new/CSharp_Console/NuGet.Config", + "commands/dotnet-new/CSharp_Console/Program.cs", + "commands/dotnet-new/CSharp_Console/project.json", + "commands/dotnet-new/FSharp_Console/NuGet.config", + "commands/dotnet-new/FSharp_Console/Program.fs", + "commands/dotnet-new/FSharp_Console/project.json" + ], "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23727", - + "Newtonsoft.Json": "7.0.1", + + "Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20160108-01", + "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-151218", + "Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta1-20160108-01", + "Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160108-01", + "NuGet.CommandLine.XPlat": "3.4.0-beta-559", + "System.CommandLine" : "0.1.0-e160119-1", + + "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", + "Microsoft.DotNet.ILCompiler": "1.0.4-*", + "Microsoft.DotNet.ILCompiler.SDK": "1.0.4-*", + + "Microsoft.Extensions.Logging": "1.0.0-rc2-16011", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-16011", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16530", "Microsoft.Extensions.CommandLineUtils.Sources": { "type": "build", "version": "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.NETCore.ConsoleHost": "1.0.0-rc2-23727", + "Microsoft.NETCore.TestHost": "1.0.0-rc2-23727", + "NETStandard.Library": "1.0.0-rc2-23727", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23727", + "System.Diagnostics.TraceSource": "4.0.0-rc2-23727", + "System.Linq.Expressions": "4.0.11-rc2-23727", + "System.Xml.XDocument": "4.0.11-rc2-23727", + "System.Resources.ReaderWriter": "4.0.0-rc2-23727", + "System.Net.Sockets": "4.1.0-rc2-23727", + "System.IO.Compression.ZipFile": "4.0.1-rc2-23727", + "System.Threading.ThreadPool": "4.0.10-rc2-23727", + "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23727" }, "frameworks": { "dnxcore50": { diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index 66a0cdf41..0283e17bc 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -1,8 +1,7 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1-rc2-23727", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "dotnet-projectmodel-server": "1.0.0-*", + "dotnet": "1.0.0-*", "Newtonsoft.Json": "7.0.1", "xunit.runner.aspnet": "2.0.0-aspnet-rc2-16068" }, From d886cc71954413dd95e827017d47dabef059899b Mon Sep 17 00:00:00 2001 From: David Fowler Date: Mon, 1 Feb 2016 11:49:25 -0800 Subject: [PATCH 2/3] Added pack command --- src/dotnet/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index 350b75521..b1a6a6ddb 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -126,6 +126,7 @@ Common Commands: ["compile-fsc"] = CompileFscCommand.Run, ["compile-native"] = CompileNativeCommand.Run, ["new"] = NewCommand.Run, + ["pack"] = PackCommand.Run, ["projectmodel-server"] = ProjectModelServerCommand.Run, ["publish"] = PublishCommand.Run, ["restore"] = RestoreCommand.Run, From 1e703575d2c1e8757af227b3b51e686e16253aab Mon Sep 17 00:00:00 2001 From: David Fowler Date: Mon, 1 Feb 2016 15:54:18 -0800 Subject: [PATCH 3/3] Fixed native compile --- scripts/build/build_appdeps.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/build_appdeps.ps1 b/scripts/build/build_appdeps.ps1 index f4fb7e1df..55ec5172c 100644 --- a/scripts/build/build_appdeps.ps1 +++ b/scripts/build/build_appdeps.ps1 @@ -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){