forked from dotnet/cli
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'rel/1.0.0' into brthor/1702
- Loading branch information
Showing
220 changed files
with
16,904 additions
and
2,120 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,19 @@ | ||
| { | ||
| "version": "1.0.0-*", | ||
| "compilationOptions": { | ||
| "emitEntryPoint": true | ||
| }, | ||
| "compilerName": "fsc", | ||
| "compileFiles": [ | ||
| "Program.fs" | ||
| ], | ||
| "dependencies": { | ||
| "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", | ||
| "NETStandard.Library": "1.0.0-rc2-23901" | ||
| }, | ||
|
|
||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| "version": "1.0.0-*", | ||
| "compilationOptions": { | ||
| "emitEntryPoint": true | ||
| }, | ||
| "compilerName": "fsc", | ||
| "compileFiles": [ | ||
| "Program.fs" | ||
| ], | ||
| "dependencies": { | ||
| "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", | ||
| "NETStandard.Library": "1.5.0-rc2-23911" | ||
| }, | ||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,20 @@ | ||
| { | ||
| "version": "1.0.0-*", | ||
| "compilationOptions": { | ||
| "emitEntryPoint": true | ||
| }, | ||
| "compilerName": "fsc", | ||
| "compileFiles": [ | ||
| "Program.fs" | ||
| ], | ||
| "dependencies": { | ||
| "TestLibrary": "1.0.0-*", | ||
| "NETStandard.Library": "1.0.0-rc2-23901", | ||
| "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" | ||
| }, | ||
|
|
||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| "version": "1.0.0-*", | ||
| "compilationOptions": { | ||
| "emitEntryPoint": true | ||
| }, | ||
| "compilerName": "fsc", | ||
| "compileFiles": [ | ||
| "Program.fs" | ||
| ], | ||
| "dependencies": { | ||
| "TestLibrary": "1.0.0-*", | ||
| "NETStandard.Library": "1.5.0-rc2-23911", | ||
| "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" | ||
| }, | ||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| } | ||
| } |
33 changes: 16 additions & 17 deletions
33
TestAssets/FSharpTestProjects/TestAppWithArgs/project.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,19 @@ | ||
| { | ||
| "version": "1.0.0-*", | ||
| "compilationOptions": { | ||
| "emitEntryPoint": true | ||
| }, | ||
| "compilerName": "fsc", | ||
| "compileFiles": [ | ||
| "Program.fs" | ||
| ], | ||
| "dependencies": { | ||
| "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", | ||
| "NETStandard.Library": "1.0.0-rc2-23901" | ||
| }, | ||
|
|
||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| "version": "1.0.0-*", | ||
| "compilationOptions": { | ||
| "emitEntryPoint": true | ||
| }, | ||
| "compilerName": "fsc", | ||
| "compileFiles": [ | ||
| "Program.fs" | ||
| ], | ||
| "dependencies": { | ||
| "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", | ||
| "NETStandard.Library": "1.5.0-rc2-23911" | ||
| }, | ||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| { | ||
| "version": "1.0.0-*", | ||
| "dependencies": { | ||
| "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", | ||
| "NETStandard.Library": "1.0.0-rc2-23901" | ||
| }, | ||
| "compilerName": "fsc", | ||
| "compileFiles": [ | ||
| "Helper2.fs", | ||
| "Helper.fs" | ||
| ], | ||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| "version": "1.0.0-*", | ||
| "dependencies": { | ||
| "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", | ||
| "NETStandard.Library": "1.5.0-rc2-23911" | ||
| }, | ||
| "compilerName": "fsc", | ||
| "compileFiles": [ | ||
| "Helper2.fs", | ||
| "Helper.fs" | ||
| ], | ||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| } | ||
| } |
16 changes: 8 additions & 8 deletions
16
TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| { | ||
| "dependencies": { | ||
| "NETStandard.Library": "1.0.0-rc2-23901", | ||
| "EmptyLibrary": "1.0.0-*" | ||
| }, | ||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| "dependencies": { | ||
| "NETStandard.Library": "1.5.0-rc2-23911", | ||
| "EmptyLibrary": "1.0.0-*" | ||
| }, | ||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| } | ||
| } |
6 changes: 3 additions & 3 deletions
6
TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| { | ||
| "dependencies": { }, | ||
| "dependencies": {}, | ||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50", | ||
| "dependencies": { | ||
| "NETStandard.Library": "1.0.0-rc2-23901" | ||
| "NETStandard.Library": "1.5.0-rc2-23911" | ||
| } | ||
| }, | ||
| "dnx451": { } | ||
| "dnx451": {} | ||
| } | ||
| } |
4 changes: 2 additions & 2 deletions
4
TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 8 additions & 8 deletions
16
TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| { | ||
| "dependencies": { | ||
| "NETStandard.Library": "1.0.0-rc2-23901", | ||
| "Microsoft.Web.Administration": "7.0.0" | ||
| }, | ||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| "dependencies": { | ||
| "NETStandard.Library": "1.5.0-rc2-23911", | ||
| "Microsoft.Web.Administration": "7.0.0" | ||
| }, | ||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| } | ||
| } |
22 changes: 10 additions & 12 deletions
22
TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,12 @@ | ||
| { | ||
| "version": "1.0.0-*", | ||
| "compilationOptions": { | ||
| "emitEntryPoint": true | ||
| }, | ||
|
|
||
| "dependencies": { | ||
| "NETStandard.Library": "1.0.0-rc2-23811" | ||
| }, | ||
|
|
||
| "frameworks": { | ||
| "dnxcore50": { } | ||
| } | ||
| "version": "1.0.0-*", | ||
| "compilationOptions": { | ||
| "emitEntryPoint": true | ||
| }, | ||
| "dependencies": { | ||
| "NETStandard.Library": "1.5.0-rc2-23911" | ||
| }, | ||
| "frameworks": { | ||
| "dnxcore50": {} | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 11 additions & 13 deletions
24
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,14 @@ | ||
| { | ||
| "version": "1.0.0", | ||
| "compilationOptions": { | ||
| "emitEntryPoint": true | ||
| }, | ||
|
|
||
| "dependencies": { | ||
| "NETStandard.Library": "1.0.0-rc2-23901" | ||
| }, | ||
|
|
||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| "version": "1.0.0", | ||
| "compilationOptions": { | ||
| "emitEntryPoint": true | ||
| }, | ||
| "dependencies": { | ||
| "NETStandard.Library": "1.5.0-rc2-23911" | ||
| }, | ||
| "frameworks": { | ||
| "netstandardapp1.5": { | ||
| "imports": "dnxcore50" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.