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

Fixup merge

Browse source
This commit is contained in:
Andy Gocke 2015-11-03 15:36:06 -08:00
parent 9d5f435ef5
commit a60a030bca
4 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Microsoft.DotNet.Cli.sln
View file

@ -48,6 +48,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "src\corehost\
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Run", "src\Microsoft.DotNet.Tools.Run\Microsoft.DotNet.Tools.Run.xproj", "{1C16108C-C786-482D-BB0A-36BDAFE109ED}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Dotnet.Cli.Compiler.Common", "src\Microsoft.DotNet.Compiler.Common\Microsoft.Dotnet.Cli.Compiler.Common.xproj", "{A16958E1-24C7-4F1E-B317-204AD91625DD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -224,6 +226,22 @@ Global
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.Debug|x64.ActiveCfg = Debug|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.Debug|x64.Build.0 = Debug|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.MinSizeRel|x64.Build.0 = Debug|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.Release|Any CPU.Build.0 = Release|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.Release|x64.ActiveCfg = Release|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.Release|x64.Build.0 = Release|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{A16958E1-24C7-4F1E-B317-204AD91625DD}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -242,5 +260,6 @@ Global
{3673DD4B-F7D3-40A1-A756-F8354A5B74CD} = {C0CA389D-A35E-4082-BC05-598C9D6301BC}
{5D67FC6A-6392-4807-97BC-D13CA0FF5E6D} = {C0CA389D-A35E-4082-BC05-598C9D6301BC}
{1C16108C-C786-482D-BB0A-36BDAFE109ED} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
{A16958E1-24C7-4F1E-B317-204AD91625DD} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
EndGlobalSection
EndGlobal

1
src/Microsoft.DotNet.Compiler.Common/CommonCompilerOptionsExtensions.cs
View file

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.CommandLine;
using System.Linq;
using Microsoft.DotNet.Cli.Compiler.Common;
using Microsoft.Extensions.ProjectModel;
namespace Microsoft.DotNet.Cli.Compiler.Common

8
src/Microsoft.DotNet.Compiler.Common/project.json
View file

@ -2,10 +2,10 @@
"version": "1.0.0-*",
"dependencies": {
"System.CommandLine": "0.1-*",
"System.Linq": "4.0.1-beta-23428",
"System.Runtime": "4.0.21-beta-23428",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"System.CommandLine": "0.1.0-*",
"System.Linq": "4.0.1-beta-23502",
"System.Runtime": "4.0.21-beta-23502",
"Microsoft.DotNet.ProjectModel": "1.0.0-*"
},
"frameworks": {

3
src/Microsoft.DotNet.Tools.Compiler.Csc/project.json
View file

@ -7,6 +7,7 @@
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23502",
"System.CommandLine": "0.1.0-*",
"System.Console": "4.0.0-beta-23502",
"System.Collections": "4.0.11-beta-23502",
"System.Linq": "4.0.1-beta-23502",
@ -21,6 +22,8 @@
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.Net.Compilers.netcore": "1.1.0-*"
},
"frameworks": {