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

t Convert Test Assets to Microsoft.NETCore.App

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

4
TestAssets/TestPackages/dotnet-dependency-context-test/project.json
View file

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

2
TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json
View file

@ -18,7 +18,7 @@
"System.CommandLine": "0.1.0-e160323-1"
},
"frameworks": {
"netstandard1.5": {
"netcoreapp1.0": {
"imports": [
"portable-net45+win8",
"dnxcore50"

4
TestAssets/TestPackages/dotnet-desktop-and-portable/Program.cs
View file

@ -9,8 +9,8 @@ namespace ConsoleApplication
{
#if NET451
Console.WriteLine($"Hello {string.Join(" ", args)} From .NETFramework,Version=v4.5.1");
#elif NETSTANDARD1_5
Console.WriteLine($"Hello {string.Join(" ", args)} From .NETStandardApp,Version=v1.5");
#elif NETCOREAPP1_0
Console.WriteLine($"Hello {string.Join(" ", args)} From .NETCoreApp,Version=v1.0");
#endif
var currentAssemblyPath = typeof(ConsoleApplication.Program).GetTypeInfo().Assembly.Location;
Console.WriteLine($"Current Assembly Directory - {currentAssemblyPath}");

6
TestAssets/TestPackages/dotnet-desktop-and-portable/project.json
View file

@ -4,17 +4,13 @@
"emitEntryPoint": true
},
"frameworks": {
"netstandard1.5": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
}
},
"imports": [
"portable-net45+win8",
"dnxcore50"
]
},
"net451": {}
}

6
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json
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": { }
}
}

6
TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json
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": { }
}
}

6
TestAssets/TestPackages/dotnet-portable/project.json
View file

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