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
Download patch file Download diff file Expand all files Collapse all files

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": {