t Convert Test Assets to Microsoft.NETCore.App

fix dotnet-compile-fsc failures

fix test failures
This commit is contained in:
Bryan Thornbury 2016-04-12 17:29:07 -07:00
parent b682ab1d4f
commit 83d78129db
125 changed files with 483 additions and 492 deletions

View file

@ -4,12 +4,10 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
},
"tools": {
"dotnet-portable": {

View file

@ -4,18 +4,16 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018",
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"dotnet-hello": {
"version": "1.0.0",
"target": "package"
}
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
},
"testRunner": "must-be-specified-to-generate-deps",
"tools": {
"dotnet-portable": {
"version": "1.0.0",

View file

@ -3,17 +3,15 @@
"compilationOptions": {
"emitEntryPoint": true
},
"testRunner": "must-be-specified-to-generate-deps",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018",
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"dotnet-hello": {
"version": "1.0.0",
"target": "package"
}
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -5,11 +5,9 @@
"preserveCompilationContext": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -4,12 +4,10 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
},
"tools": {
"dotnet-portable": {

View file

@ -4,11 +4,9 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -4,7 +4,7 @@
},
"dependencies": {},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net45+win8"
@ -12,7 +12,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-24008"
"version": "1.0.0-rc2-*"
}
}
}

View file

@ -47,7 +47,7 @@ namespace Microsoft.Extensions.DependencyModel
Console.WriteLine($"Compilation {compilationLibrary.Name}:{Path.GetFileName(resolvedPath)}");
if (!File.Exists(resolvedPath))
{
Error($"Compilataion library resolved to non existent path {resolvedPath}");
Error($"Compilation library resolved to non existent path {resolvedPath}");
}
}
}

View file

@ -10,7 +10,7 @@
"netstandard1.5": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
}
},
"net451": {}

View file

@ -5,12 +5,10 @@
"preserveCompilationContext": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018",
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] }
}
}

View file

@ -4,12 +4,10 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018",
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] }
}
}

View file

@ -12,8 +12,6 @@
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {
"netstandard1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] }
}
}

View file

@ -11,8 +11,6 @@
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {
"netstandard1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] }
}
}

View file

@ -9,7 +9,7 @@
],
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"tools": {
"dotnet-compile-fsc": {
@ -22,7 +22,7 @@
}
},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"netstandard1.3"

View file

@ -12,7 +12,7 @@
"version": "1.0.0-*",
"target": "project"
},
"NETStandard.Library": "1.5.0-rc2-24018",
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221"
},
"tools": {
@ -26,7 +26,7 @@
}
},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": "dnxcore50"
}
}

View file

@ -9,7 +9,7 @@
],
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"tools": {
"dotnet-compile-fsc": {
@ -22,7 +22,7 @@
}
},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": "dnxcore50"
}
}

View file

@ -20,7 +20,7 @@
}
},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": "dnxcore50"
}
}

View file

@ -12,11 +12,11 @@
"../src/*.cs"
],
"frameworks": {
"netstandard1.5": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-24008"
"version": "1.0.0-rc2-*"
}
},
"imports": [

View file

@ -14,7 +14,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-3002306"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"imports": [
"dnxcore50",

View file

@ -6,8 +6,6 @@
"NETStandard.Library": "1.5.0-rc2-24018"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netstandard1.5": { }
}
}

View file

@ -4,11 +4,9 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -4,11 +4,7 @@
},
"dependencies": {},
"frameworks": {
"netstandard1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
],
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",

View file

@ -5,11 +5,7 @@
},
"dependencies": {},
"frameworks": {
"netstandard1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
],
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",

View file

@ -4,18 +4,15 @@
},
"dependencies": {},
"frameworks": {
"netstandard1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
],
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
"System.Linq": "4.0.0"
}
},
"imports": "dnxcore50"
}
}
}

View file

@ -3,18 +3,15 @@
"emitEntryPoint": true
},
"frameworks": {
"netstandard1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
],
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
}
},
"imports": "dnxcore50"
}
}
}

View file

@ -3,13 +3,9 @@
"emitEntryPoint": true
},
"frameworks": {
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
],
"netcoreapp1.0": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
}
}
},

View file

@ -0,0 +1,22 @@
// 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 Xunit;
namespace FakeTests
{
public class GivenThatIWantSomeFakeTests
{
[Fact]
public void It_succeeds()
{
Assert.True(true);
}
[Fact]
public void It_also_succeeds()
{
Assert.True(true);
}
}
}

View file

@ -0,0 +1,23 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
},
"System.Linq.Expressions": "4.0.11-rc2-24018",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24018",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-dev-140469-38"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"netstandardapp1.5",
"dnxcore50",
"portable-net45+win8"
]
}
},
"testRunner": "xunit"
}

View file

@ -5,10 +5,9 @@
},
"frameworks": {
"netcoreapp1.0": {
"imports": "dnxcore50",
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-24008",
"version": "1.0.0-rc2-*",
"type": "platform"
}
}

View file

@ -6,11 +6,9 @@
},
"dependencies": {
"TestLibrary": "1.0.0-*",
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -13,8 +13,6 @@
"NETStandard.Library": "1.5.0-rc2-24018"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netstandard1.5": { }
}
}

View file

@ -4,11 +4,9 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -5,12 +5,10 @@
"outputName": "AppWithContentPackage"
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018",
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"SharedContentA": "1.0.0-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { "imports": ["netstandardapp1.5", "dnxcore50"] }
}
}

View file

@ -4,12 +4,10 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"content": "testcontentfile.txt",
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -9,11 +9,9 @@
"target": "project",
"version": "1.0.0-*"
},
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -13,8 +13,6 @@
"NETStandard.Library": "1.5.0-rc2-24018"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netstandard1.5": { }
}
}

View file

@ -4,12 +4,10 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
},
"scripts": {
"prepublish": [

View file

@ -9,12 +9,10 @@
"target": "project",
"version": "1.0.0-*"
},
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
},
"scripts": {
"prepublish": [

View file

@ -13,8 +13,6 @@
"NETStandard.Library": "1.5.0-rc2-24018"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -11,8 +11,6 @@
"NETStandard.Library": "1.5.0-rc2-24018"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -8,8 +8,6 @@
"NETStandard.Library": "1.5.0-rc2-24018"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -9,11 +9,9 @@
"target": "project",
"version": "1.0.0-*"
},
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -1,7 +1,6 @@
{
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50",
"netcoreapp1.0": {
"bin": {
"assembly": "bin.keep\\{configuration}\\dnxcore50\\TestLibrary.dll",
"pdb": "bin.keep\\{configuration}\\dnxcore50\\TestLibrary.pdb"

View file

@ -1,19 +1,19 @@
{
"version": "1.0.0-*",
"testRunner": "xunit",
"dependencies": {
"Newtonsoft.Json": "7.0.1"
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+wp80+win8"
],
"netstandard1.5": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
}
},
"imports": "portable-net45+win8"
}
}
}

View file

@ -1,22 +1,22 @@
{
"version": "1.0.0-*",
"testRunner": "xunit",
"dependencies": {
"Newtonsoft.Json": "6.0.0",
"Newtonsoft.Json": "6.0.1",
"TestLibraryGreater": {
"target": "project"
}
},
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+wp80+win8"
],
"netstandard1.5": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
}
},
"imports": "portable-net45+win8"
}
}
}

View file

@ -11,8 +11,6 @@
}
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netstandard1.5": { }
}
}

View file

@ -16,8 +16,6 @@
"Test": {}
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netstandard1.5": { }
}
}

View file

@ -9,8 +9,7 @@
"net35": {},
"net40": {},
"net461": {},
"netstandardapp1.5": {
"imports": "dnxcore50",
"netstandard1.5": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
}

View file

@ -2,10 +2,10 @@
"version": "1.0.0",
"dependencies": {},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
}
},
"net451": {

View file

@ -2,9 +2,9 @@
"version": "1.0.0-*",
"dependencies": {},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
}
},
"net451": {

View file

@ -6,11 +6,9 @@
"dependencies": {
"L11": "1.0.0-*",
"L12": "1.0.0-*",
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -3,10 +3,10 @@
"dependencies": {
"L12": "1.0.0-*",
"L21": "1.0.0-*",
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"netstandard1.5": {
"imports": "dnxcore50"
}
}

View file

@ -2,10 +2,10 @@
"version": "1.0.0-*",
"dependencies": {
"L22": "1.0.0-*",
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"netstandard1.5": {
"imports": "dnxcore50"
}
}

View file

@ -1,10 +1,10 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"netstandard1.5": {
"imports": "dnxcore50"
}
}

View file

@ -1,10 +1,10 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"netstandard1.5": {
"imports": "dnxcore50"
}
}

View file

@ -4,11 +4,9 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -4,11 +4,9 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -5,11 +5,9 @@
"xmlDoc": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
"netcoreapp1.0": { }
}
}

View file

@ -2,9 +2,9 @@
"version": "1.0.0-*",
"dependencies": {},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
}
},
"net451": {

View file

@ -2,9 +2,9 @@
"version": "1.0.0-*",
"dependencies": {},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24018"
"Microsoft.NETCore.App": "1.0.0-rc2-*"
}
},
"net451": {