mirrors/dotnet-installer
Archived
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
commit 83d78129db
125 changed files with 483 additions and 492 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TestAssets/CrossPublishTestProjects/StandaloneAppCrossPublish/Program.cs
View file

@ -1,12 +0,0 @@
using System;
namespace StandaloneApp
{
public static class Program
{
public static void Main(string[] args)
{
Console.WriteLine("Hello, World!");
}
}
}

35
TestAssets/CrossPublishTestProjects/StandaloneAppCrossPublish/project.json
View file

@ -1,35 +0,0 @@
{
"compilationOptions": {
"emitEntryPoint": true
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net45+win8"
],
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
}
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
},
"runtimeOptions": {
"somethingString": "anything",
"somethingBoolean": true,
"someArray": ["one", "two"],
"someObject": {
"someProperty": "someValue"
}
}
}

2
TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json
View file

@ -7,7 +7,7 @@
"dotnet-desktop-and-portable": "1.0.0-*"
},
"frameworks": {
"netstandard1.5": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",

6
TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json
View file

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

5
TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json
View file

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

4
TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json
View file

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

6
TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json
View file

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

4
TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json
View file

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

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",

6
TestAssets/TestProjects/AppWithBomGlobalJson/project.json
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": {

8
TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json
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",

8
TestAssets/TestProjects/AppWithDirectDependency/project.json
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": { }
}
}

6
TestAssets/TestProjects/AppWithOutputAssemblyName/project.json
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": { }
}
}

6
TestAssets/TestProjects/AppWithToolDependency/project.json
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": {

6
TestAssets/TestProjects/CompileFail/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": { }
}
}

4
TestAssets/TestProjects/DependencyContextFromTool/project.json
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-*"
}
}
}

2
TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/Validator.cs
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}");
}
}
}

2
TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json
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": {}

6
TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json
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"] }
}
}

6
TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json
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"] }
}
}

4
TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json
View file

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

4
TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json
View file

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

4
TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json
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"

4
TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json
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"
}
}

4
TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json
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"
}
}

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

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

4
TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json
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": [

2
TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json
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",

0
TestAssets/CrossPublishTestProjects/StandaloneAppCrossPublish/.noautobuild → TestAssets/TestProjects/LibraryWithOutputAssemblyName/.noautobuild
View file

4
TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json
View file

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

6
TestAssets/TestProjects/OutputStandardOutputAndError/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/TestProjects/PortableTests/PortableApp/project.json
View file

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

6
TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json
View file

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

9
TestAssets/TestProjects/PortableTests/PortableAppWithIntentionalManagedDowngrade/project.json
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"
}
}
}

9
TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json
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"
}
}
}

8
TestAssets/TestProjects/PortableTests/StandaloneApp/project.json
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-*"
}
}
},

0
TestAssets/ProjectWithTests/GivenThatIWantSomeFakeTests.cs → TestAssets/TestProjects/ProjectWithTests/GivenThatIWantSomeFakeTests.cs
View file

0
TestAssets/ProjectWithTests/project.json → TestAssets/TestProjects/ProjectWithTests/project.json
View file

3
TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json
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"
}
}

6
TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json
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": { }
}
}

0
TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/.noautobuild Normal file
View file

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

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

6
TestAssets/TestProjects/TestAppWithArgs/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/TestProjects/TestAppWithContentPackage/project.json
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"] }
}
}

6
TestAssets/TestProjects/TestAppWithContents/project.json
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": { }
}
}

6
TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json
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": { }
}
}

0
TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/.noautobuild Normal file
View file

4
TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json
View file

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

6
TestAssets/TestProjects/TestAppWithScripts/project.json
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": [

6
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json
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": [

4
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json
View file

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

4
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json
View file

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

4
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json
View file

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

6
TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json
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": { }
}
}

3
TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/project.json
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"

0
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/.noautobuild Normal file
View file

12
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json
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"
}
}
}

0
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/.noautobuild Normal file
View file

14
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json
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"
}
}
}

0
TestAssets/TestProjects/TestLibraryWithAnalyzer/.noautobuild Normal file
View file

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

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

0
TestAssets/TestProjects/TestLibraryWithConfiguration/.noautobuild Normal file
View file

4
TestAssets/TestProjects/TestLibraryWithConfiguration/project.json
View file

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

0
TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/.noautobuild Normal file
View file

3
TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json
View file

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

4
TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json
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": {

4
TestAssets/TestProjects/TestMscorlibReference/project.json
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": {

6
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json
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": { }
}
}

0
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/.noautobuild Normal file
View file

4
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json
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"
}
}

0
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/.noautobuild Normal file
View file

4
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json
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"
}
}

0
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/.noautobuild Normal file
View file

4
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json
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"
}
}

0
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/.noautobuild Normal file
View file

4
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json
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"
}
}

6
TestAssets/TestProjects/TestProjectWithCultureSpecificResource/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/TestProjects/TestProjectWithResource/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/TestProjects/TestSimpleIncrementalApp/project.json
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": { }
}
}

4
TestAssets/TestProjects/TestSystemCoreReference/project.json
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": {

4
TestAssets/TestProjects/TestSystemReference/project.json
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": {

103
scripts/dotnet-cli-build/CompileTargets.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Linq;
using System.Runtime.InteropServices;
using Microsoft.DotNet.Cli.Build.Framework;
@ -35,6 +36,26 @@ namespace Microsoft.DotNet.Cli.Build
"vbc.exe"
};
public static readonly string[] HostPackageSupportedRids = new[]
{
"win7-x64",
"win7-x86",
"osx.10.10-x64",
"osx.10.11-x64",
"ubuntu.14.04-x64",
"centos.7-x64",
"rhel.7-x64",
"rhel.7.2-x64",
"debian.8-x64"
};
public static readonly string[] HostPackages = new[]
{
"Microsoft.NETCore.DotNetHost",
"Microsoft.NETCore.DotNetHostPolicy",
"Microsoft.NETCore.DotNetHostResolver"
};
public const string SharedFrameworkName = "Microsoft.NETCore.App";
public static Crossgen CrossgenUtil = new Crossgen(CoreCLRVersion);
@ -58,6 +79,33 @@ namespace Microsoft.DotNet.Cli.Build
return c.Success();
}
// We need to generate stub host packages so we can restore our standalone test assets against the metapackage
// we built earlier in the build
// https://github.com/dotnet/cli/issues/2438
[Target]
public static BuildTargetResult GenerateStubHostPackages(BuildTargetContext c)
{
string currentRid = GetRuntimeId();
var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion");
foreach (var hostPackageId in HostPackages)
{
foreach (var rid in HostPackageSupportedRids)
{
if (! rid.Equals(currentRid))
{
CreateDummyRuntimeNuGetPackage(
DotNetCli.Stage0,
hostPackageId,
rid,
buildVersion.HostNuGetPackageVersion,
Dirs.CorehostDummyPackages);
}
}
}
return c.Success();
}
private static string HostVer = "1.0.1";
private static string HostPolicyVer = "1.0.1";
private static string HostFxrVer = "1.0.1";
@ -146,7 +194,7 @@ namespace Microsoft.DotNet.Cli.Build
return c.Success();
}
[Target]
[Target(nameof(CompileTargets.GenerateStubHostPackages))]
public static BuildTargetResult PackagePkgProjects(BuildTargetContext c)
{
var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion");
@ -158,7 +206,8 @@ namespace Microsoft.DotNet.Cli.Build
var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}";
var pkgDir = Path.Combine(c.BuildContext.BuildDirectory, "pkg");
File.WriteAllText(Path.Combine(pkgDir, "version.txt"), content);
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (CurrentPlatform.IsWindows)
{
Command.Create(Path.Combine(pkgDir, "pack.cmd"))
// Workaround to arg escaping adding backslashes for arguments to .cmd scripts.
@ -305,6 +354,50 @@ namespace Microsoft.DotNet.Cli.Build
return c.Success();
}
private static void CreateDummyRuntimeNuGetPackage(DotNetCli dotnet, string basePackageId, string rid, string version, string outputDir)
{
var packageId = $"runtime.{rid}.{basePackageId}";
var projectJson = new StringBuilder();
projectJson.Append("{");
projectJson.Append($" \"version\": \"{version}\",");
projectJson.Append($" \"name\": \"{packageId}\",");
projectJson.Append(" \"dependencies\": { \"NETStandard.Library\": \"1.5.0-rc2-24008\" },");
projectJson.Append(" \"frameworks\": { \"netcoreapp1.0\": { \"imports\": [\"netstandard1.5\", \"dnxcore50\"] } },");
projectJson.Append($" \"runtimes\": {{ \"{rid}\": {{ }} }},");
projectJson.Append("}");
var programCs = "using System; namespace ConsoleApplication { public class Program { public static void Main(string[] args) { Console.WriteLine(\"Hello World!\"); } } }";
var tempPjDirectory = Path.Combine(Dirs.Intermediate, "dummyNuGetPackageIntermediate");
FS.Rmdir(tempPjDirectory);
Directory.CreateDirectory(tempPjDirectory);
var tempPjFile = Path.Combine(tempPjDirectory, "project.json");
var tempSourceFile = Path.Combine(tempPjDirectory, "Program.cs");
File.WriteAllText(tempPjFile, projectJson.ToString());
File.WriteAllText(tempSourceFile, programCs.ToString());
dotnet.Restore("--verbosity", "verbose", "--disable-parallel")
.WorkingDirectory(tempPjDirectory)
.Execute()
.EnsureSuccessful();
dotnet.Build(tempPjFile, "--runtime", rid)
.WorkingDirectory(tempPjDirectory)
.Execute()
.EnsureSuccessful();
dotnet.Pack(
tempPjFile, "--no-build",
"--output", outputDir)
.WorkingDirectory(tempPjDirectory)
.Execute()
.EnsureSuccessful();
}
private static void CleanOutputDir(string directory)
{
foreach (var file in FilesToClean)
@ -346,7 +439,11 @@ namespace Microsoft.DotNet.Cli.Build
string SharedFrameworkSourceRoot = GenerateSharedFrameworkProject(c, SharedFrameworkTemplateSourceRoot, sharedFrameworkRid);
dotnetCli.Restore("--verbosity", "verbose", "--disable-parallel", "--infer-runtimes", "--fallbacksource", Dirs.Corehost)
dotnetCli.Restore(
"--verbosity", "verbose",
"--disable-parallel",
"--infer-runtimes",
"--fallbacksource", Dirs.Corehost)
.WorkingDirectory(SharedFrameworkSourceRoot)
.Execute()
.EnsureSuccessful();

52
scripts/dotnet-cli-build/TestTargets.cs
View file

@ -58,7 +58,7 @@ namespace Microsoft.DotNet.Cli.Build
[Target(nameof(RestoreTestAssetPackages), nameof(BuildTestAssetPackages))]
public static BuildTargetResult SetupTestPackages(BuildTargetContext c) => c.Success();
[Target(nameof(RestoreTestAssetProjects), nameof(RestoreDesktopTestAssetProjects), nameof(RestoreCrossPublishTestAssetProjects), nameof(BuildTestAssetProjects))]
[Target(nameof(RestoreTestAssetProjects), nameof(RestoreDesktopTestAssetProjects), nameof(BuildTestAssetProjects))]
public static BuildTargetResult SetupTestProjects(BuildTargetContext c) => c.Success();
[Target]
@ -70,7 +70,10 @@ namespace Microsoft.DotNet.Cli.Build
CleanNuGetTempCache();
var dotnet = DotNetCli.Stage2;
dotnet.Restore("--verbosity", "verbose", "--infer-runtimes", "--fallbacksource", Dirs.Corehost)
dotnet.Restore("--verbosity", "verbose",
"--infer-runtimes",
"--fallbacksource", Dirs.Corehost,
"--fallbacksource", Dirs.CorehostDummyPackages)
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "TestPackages"))
.Execute()
.EnsureSuccessful();
@ -91,25 +94,18 @@ namespace Microsoft.DotNet.Cli.Build
"--verbosity", "verbose",
"--infer-runtimes",
"--fallbacksource", Dirs.TestPackages,
"--fallbacksource", Dirs.Corehost)
"--fallbacksource", Dirs.Corehost,
"--fallbacksource", Dirs.CorehostDummyPackages)
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "TestProjects"))
.Execute()
.EnsureSuccessful();
// The 'ProjectWithTests' is a portable test app. Cannot call --infer-runtimes on it, since on win x64 machines,
// the x86 runtime is being inferred, and there are no x86 DotNetHost packages
dotnet.Restore(
"--verbosity", "verbose",
"--fallbacksource", Dirs.Corehost)
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "ProjectWithTests"))
.Execute()
.EnsureSuccessful();
// The 'ProjectModelServer' directory contains intentionally-unresolved dependencies, so don't check for success. Also, suppress the output
dotnet.Restore(
"--verbosity", "verbose",
"--infer-runtimes",
"--fallbacksource", Dirs.Corehost)
"--fallbacksource", Dirs.Corehost,
"--fallbacksource", Dirs.CorehostDummyPackages)
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "ProjectModelServer", "DthTestProjects"))
.Execute();
@ -131,25 +127,14 @@ namespace Microsoft.DotNet.Cli.Build
dotnet.Restore("--verbosity", "verbose",
"--infer-runtimes",
"--fallbacksource", Dirs.TestPackages,
"--fallbacksource", Dirs.Corehost)
"--fallbacksource", Dirs.Corehost,
"--fallbacksource", Dirs.CorehostDummyPackages)
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "DesktopTestProjects"))
.Execute().EnsureSuccessful();
return c.Success();
}
[Target]
public static BuildTargetResult RestoreCrossPublishTestAssetProjects(BuildTargetContext c)
{
var dotnet = DotNetCli.Stage2;
dotnet.Restore("--verbosity", "verbose")
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "CrossPublishTestProjects"))
.Execute().EnsureSuccessful();
return c.Success();
}
[Target(nameof(CleanTestPackages), nameof(CleanProductPackages))]
public static BuildTargetResult BuildTestAssetPackages(BuildTargetContext c)
{
@ -178,7 +163,7 @@ namespace Microsoft.DotNet.Cli.Build
{
"netstandard1.5",
"netstandard1.3",
"netstandardapp1.5"
"netcoreapp1.0"
};
if (CurrentPlatform.IsWindows)
@ -262,20 +247,12 @@ namespace Microsoft.DotNet.Cli.Build
foreach (var project in projects)
{
c.Info($"Building: {project}");
dotnet.Build("--framework", "netstandardapp1.5")
dotnet.Build("--framework", "netcoreapp1.0")
.WorkingDirectory(Path.GetDirectoryName(project))
.Execute()
.EnsureSuccessful();
}
// build ProjectWithTests, which is outside of TestProjects and targets netcoreapp
string projectWithTests = Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "ProjectWithTests");
c.Info($"Building: {projectWithTests}");
dotnet.Build("--framework", "netcoreapp1.0")
.WorkingDirectory(projectWithTests)
.Execute()
.EnsureSuccessful();
return c.Success();
}
@ -288,7 +265,8 @@ namespace Microsoft.DotNet.Cli.Build
CleanNuGetTempCache();
DotNetCli.Stage2.Restore("--verbosity", "verbose",
"--fallbacksource", Dirs.TestPackages,
"--fallbacksource", Dirs.Corehost)
"--fallbacksource", Dirs.Corehost,
"--fallbacksource", Dirs.CorehostDummyPackages)
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "test"))
.Execute()
.EnsureSuccessful();

1
scripts/dotnet-cli-build/Utils/BuildVersion.cs
View file

@ -13,6 +13,7 @@
public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";
public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}";
public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc2-3{CommitCountString}";
public string HostNuGetPackageVersion => $"{Major}.{Minor}.1-rc2-{CommitCountString}-00";
public string ProductionVersion => $"{Major}.{Minor}.{Patch}";
public string GenerateMsiVersion()

1
scripts/dotnet-cli-build/Utils/Dirs.cs
View file

@ -23,6 +23,7 @@ namespace Microsoft.DotNet.Cli.Build
public static readonly string Stage2Compilation = Path.Combine(Output, "stage2compilation");
public static readonly string Stage2Symbols = Path.Combine(Output, "stage2symbols");
public static readonly string Corehost = Path.Combine(Output, "corehost");
public static readonly string CorehostDummyPackages = Path.Combine(Output, "corehostdummypackages");
public static readonly string TestOutput = Path.Combine(Output, "tests");
public static readonly string TestArtifacts = Path.Combine(TestOutput, "artifacts");
public static readonly string TestPackages = Path.Combine(TestOutput, "packages");

1
src/dotnet-compile-fsc/Program.cs
View file

@ -85,6 +85,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Fsc
bool targetNetCore =
commonOptions.Defines.Contains("DNXCORE50") ||
commonOptions.Defines.Where(d => d.StartsWith("NETSTANDARDAPP1_")).Any() ||
commonOptions.Defines.Where(d => d.StartsWith("NETCOREAPP1_")).Any() ||
commonOptions.Defines.Where(d => d.StartsWith("NETSTANDARD1_")).Any();
// Get FSC Path upfront to use it for win32manifest path

2
src/dotnet-compile-fsc/project.json
View file

@ -15,7 +15,7 @@
}
},
"frameworks": {
"netstandard1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net45+win81",

2
src/dotnet/commands/dotnet-publish/PublishCommand.cs
View file

@ -77,7 +77,7 @@ namespace Microsoft.DotNet.Tools.Publish
}
/// <summary>
/// Publish the project for given 'framework (ex - netstandardapp1.5)' and 'runtimeID (ex - win7-x64)'
/// Publish the project for given 'framework (ex - netcoreapp1.0)' and 'runtimeID (ex - win7-x64)'
/// </summary>
/// <param name="context">project that is to be published</param>
/// <param name="baseOutputPath">Location of published files</param>

4
test/Kestrel.Tests/DotnetBuildTest.cs
View file

@ -31,9 +31,9 @@ namespace Microsoft.DotNet.Kestrel.Tests
var outputBase = new DirectoryInfo(Path.Combine(testRoot, "bin", "Debug"));
var netstandardappOutput = outputBase.Sub("netstandard1.5");
var netcoreAppOutput = outputBase.Sub("netcoreapp1.0");
netstandardappOutput.Should()
netcoreAppOutput.Should()
.Exist().And
.OnlyHaveFiles(new[]
{

24
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolver.cs
View file

@ -36,7 +36,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandArguments = new string[] {""},
ProjectDirectory = "/some/directory",
Configuration = "Debug",
Framework = FrameworkConstants.CommonFrameworks.NetStandardApp15
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
};
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
@ -55,7 +55,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandArguments = new string[] {""},
ProjectDirectory = null,
Configuration = "Debug",
Framework = FrameworkConstants.CommonFrameworks.NetStandardApp15
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
};
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
@ -93,7 +93,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandArguments = new string[] {""},
ProjectDirectory = s_liveProjectDirectory,
Configuration = null,
Framework = FrameworkConstants.CommonFrameworks.NetStandardApp15
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
};
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
@ -112,7 +112,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandArguments = null,
ProjectDirectory = s_liveProjectDirectory,
Configuration = "Debug",
Framework = FrameworkConstants.CommonFrameworks.NetStandardApp15
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
};
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
@ -131,7 +131,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandArguments = null,
ProjectDirectory = s_liveProjectDirectory,
Configuration = "Debug",
Framework = FrameworkConstants.CommonFrameworks.NetStandardApp15
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
};
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
@ -156,7 +156,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandArguments = new [] { "arg with space"},
ProjectDirectory = s_liveProjectDirectory,
Configuration = "Debug",
Framework = FrameworkConstants.CommonFrameworks.NetStandardApp15
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
};
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
@ -176,7 +176,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandArguments = null,
ProjectDirectory = s_liveProjectDirectory,
Configuration = "Debug",
Framework = FrameworkConstants.CommonFrameworks.NetStandardApp15
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
};
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
@ -196,13 +196,13 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandArguments = null,
ProjectDirectory = s_liveProjectDirectory,
Configuration = "Debug",
Framework = FrameworkConstants.CommonFrameworks.NetStandardApp15,
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10,
OutputPath = AppContext.BaseDirectory
};
var projectContext = ProjectContext.Create(
s_liveProjectDirectory,
FrameworkConstants.CommonFrameworks.NetStandardApp15,
FrameworkConstants.CommonFrameworks.NetCoreApp10,
PlatformServices.Default.Runtime.GetAllCandidateRuntimeIdentifiers());
var depsFilePath =
@ -225,13 +225,13 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandArguments = null,
ProjectDirectory = s_liveProjectDirectory,
Configuration = "Debug",
Framework = FrameworkConstants.CommonFrameworks.NetStandardApp15,
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10,
BuildBasePath = AppContext.BaseDirectory
};
var projectContext = ProjectContext.Create(
s_liveProjectDirectory,
FrameworkConstants.CommonFrameworks.NetStandardApp15,
FrameworkConstants.CommonFrameworks.NetCoreApp10,
PlatformServices.Default.Runtime.GetAllCandidateRuntimeIdentifiers());
var depsFilePath =
@ -254,7 +254,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
CommandArguments = null,
ProjectDirectory = s_liveProjectDirectory,
Configuration = "Debug",
Framework = FrameworkConstants.CommonFrameworks.NetStandardApp15
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
};
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);

2
test/Microsoft.DotNet.Cli.Utils.Tests/StreamForwarderTests.cs
View file

@ -139,7 +139,7 @@ namespace StreamForwarderTests
buildCommand.Execute();
var buildOutputExe = "OutputStandardOutputAndError" + Constants.ExeSuffix;
var buildOutputPath = Path.Combine(binTestProjectPath, "bin/Debug/netstandardapp1.5", buildOutputExe);
var buildOutputPath = Path.Combine(binTestProjectPath, "bin/Debug/netcoreapp1.0", buildOutputExe);
return buildOutputPath;
}

4
test/Microsoft.DotNet.ProjectModel.Tests/PackageDependencyProviderTests.cs
View file

@ -29,8 +29,8 @@ namespace Microsoft.DotNet.ProjectModel.Tests
target.CompileTimeAssemblies.Add("lib/dotnet/_._");
target.NativeLibraries.Add("runtimes/any/native/Microsoft.CSharp.CurrentVersion.targets");
var p1 = provider.GetDescription(NuGetFramework.Parse("netstandardapp1.5"), package, target);
var p2 = provider.GetDescription(NuGetFramework.Parse("netstandardapp1.5"), package, target);
var p1 = provider.GetDescription(NuGetFramework.Parse("netcoreapp1.0"), package, target);
var p2 = provider.GetDescription(NuGetFramework.Parse("netcoreapp1.0"), package, target);
Assert.True(p1.Compatible);
Assert.True(p2.Compatible);

8
test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs
View file

@ -112,16 +112,16 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
$"StdErr:{Environment.NewLine}{_commandResult.StdErr}{Environment.NewLine}"; ;
}
public AndConstraint<CommandResultAssertions> HaveSkippedProjectCompilation(string skippedProject)
public AndConstraint<CommandResultAssertions> HaveSkippedProjectCompilation(string skippedProject, string frameworkFullName)
{
_commandResult.StdOut.Should().Contain($"Project {skippedProject} (.NETStandardApp,Version=v1.5) was previously compiled. Skipping compilation.");
_commandResult.StdOut.Should().Contain($"Project {skippedProject} ({frameworkFullName}) was previously compiled. Skipping compilation.");
return new AndConstraint<CommandResultAssertions>(this);
}
public AndConstraint<CommandResultAssertions> HaveCompiledProject(string compiledProject)
public AndConstraint<CommandResultAssertions> HaveCompiledProject(string compiledProject, string frameworkFullName)
{
_commandResult.StdOut.Should().Contain($"Project {compiledProject} (.NETStandardApp,Version=v1.5) will be compiled");
_commandResult.StdOut.Should().Contain($"Project {compiledProject} ({frameworkFullName}) will be compiled");
return new AndConstraint<CommandResultAssertions>(this);
}

1
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs
View file

@ -69,6 +69,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
string config = string.IsNullOrEmpty(_config) ? "Debug" : _config;
string framework = string.IsNullOrEmpty(_framework) ?
_project.GetTargetFrameworks().First().FrameworkName.GetShortFolderName() : _framework;
if (!portable)
{
var runtime = string.IsNullOrEmpty(_runtime) ? PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier() : _runtime;

Some files were not shown because too many files have changed in this diff Show more