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

Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into test-fx

Browse source
This commit is contained in:
Sridhar Periyasamy 2016-02-11 14:22:24 -08:00
commit f86952cf1d
72 changed files with 569 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/TestProjects/CompileFail/project.json
View file

@ -5,7 +5,7 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"frameworks": {

2
TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json
View file

@ -8,7 +8,7 @@
"dependencies": {
"TestLibrary": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"frameworks": {

2
TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json
View file

@ -6,7 +6,7 @@
"additionalArguments": [ "-highentropyva+" ]
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"frameworks": {

2
TestAssets/TestProjects/TestAppWithArgs/project.json
View file

@ -5,7 +5,7 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"frameworks": {

2
TestAssets/TestProjects/TestAppWithContents/project.json
View file

@ -5,7 +5,7 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"content": "testcontentfile.txt",

7
TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json
View file

@ -1,13 +1,14 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"dependencies": {
"TestLibrary": { "target":"project"},
"TestLibrary": { "target":"project", "version":"1.0.0-*" },
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"frameworks": {

17
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/Program.cs Normal file
View file

@ -0,0 +1,17 @@
// 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;
using System.Diagnostics;
namespace TestApp
{
public class Program
{
public static int Main(string[] args)
{
Console.WriteLine(TestLibrary.Helper.GetMessage());
return 0;
}
}
}

16
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/project.json Normal file
View file

@ -0,0 +1,16 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"TestLibraryWithAppDependency": { "target":"project", "version":"1.0.0-*" },
"NETStandard.Library": "1.0.0-rc2-23808"
},
"frameworks": {
"dnxcore50": { }
},
}

2
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json
View file

@ -10,7 +10,7 @@
"dnxcore50": {
"imports" : "portable-net45+wp80+win8",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
}
}
}

2
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json
View file

@ -11,7 +11,7 @@
"dnxcore50": {
"imports" : "portable-net45+wp80+win8",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
}
}
}

2
TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json
View file

@ -5,7 +5,7 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23808",
"NETStandard.Library": "1.0.0-rc2-23811",
"System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" }
},

24
TestAssets/TestProjects/TestLibraryWithAppDependency/Helper.cs Normal file
View file

@ -0,0 +1,24 @@
// 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;
namespace TestLibrary2
{
public static class Helper
{
/// <summary>
/// Gets the message from the helper. This comment is here to help test XML documentation file generation, please do not remove it.
/// </summary>
/// <returns>A message</returns>
public static string GetMessage()
{
return "This string came from the test library!";
}
public static void SayHi()
{
Console.WriteLine("Hello there!");
}
}
}

12
TestAssets/TestProjects/TestLibraryWithAppDependency/project.json Normal file
View file

@ -0,0 +1,12 @@
{
"version": "1.0.0-*",
"dependencies": {
"TestApp": { "target":"project", "version":"1.0.0-*" },
"NETStandard.Library": "1.0.0-rc2-23808",
},
"frameworks": {
"dnxcore50": { }
}
}

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json
View file

@ -8,7 +8,7 @@
"L11": "1.0.0-*",
"L12": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"frameworks": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json
View file

@ -5,7 +5,7 @@
"L12": "1.0.0-*",
"L21": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"frameworks": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json
View file

@ -4,7 +4,7 @@
"dependencies": {
"L22": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"frameworks": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"frameworks": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"frameworks": {

2
TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json
View file

@ -5,7 +5,7 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"frameworks": {

2
TestAssets/TestProjects/TestProjectWithResource/project.json
View file

@ -5,7 +5,7 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"frameworks": {

2
TestAssets/TestProjects/TestSimpleIncrementalApp/project.json
View file

@ -6,7 +6,7 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23808"
"NETStandard.Library": "1.0.0-rc2-23811"
},
"frameworks": {