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

Remove '--infer-runtimes' option for 'dotnet restore' when restoring

Browse source 
TestAssets.
This commit is contained in:
Sridhar Periyasamy 2016-05-17 19:44:18 -07:00 • committed by Livar Cunha
parent a2ef88cf86
commit 0c463c281f
58 changed files with 385 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json
View file

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

10
TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json
View file

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

10
TestAssets/TestProjects/AppWithBomGlobalJson/project.json
View file

@ -9,6 +9,16 @@
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
},
"tools": {
"dotnet-portable": {
"version": "1.0.0",

10
TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json
View file

@ -13,6 +13,16 @@
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
},
"tools": {
"dotnet-portable": {
"version": "1.0.0",

10
TestAssets/TestProjects/AppWithDirectDependency/project.json
View file

@ -12,5 +12,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

10
TestAssets/TestProjects/AppWithOutputAssemblyName/project.json
View file

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

10
TestAssets/TestProjects/AppWithToolDependency/project.json
View file

@ -14,5 +14,15 @@
"version": "1.0.0",
"target": "package"
}
},
"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": {}
}
}

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

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

2
TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json.modified
View file

@ -7,7 +7,7 @@
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
}
}
}

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

@ -6,7 +6,7 @@
}
},
"frameworks": {
"netstandard1.6": {
"netstandard1.5": {
"imports": "dnxcore50",
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-*"

17
TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json
View file

@ -9,11 +9,16 @@
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
"netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] }
},
"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": {}
}
}

17
TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json
View file

@ -8,11 +8,16 @@
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
"netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] }
},
"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": {}
}
}

10
TestAssets/TestProjects/EndToEndTestApp/project.json
View file

@ -27,5 +27,15 @@
"publishOptions": "testpublishfile.txt",
"frameworks": {
"netcoreapp1.0": { }
},
"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": {}
}
}

10
TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json
View file

@ -30,5 +30,15 @@
"netstandard1.3"
]
}
},
"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": {}
}
}

10
TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json
View file

@ -31,5 +31,15 @@
"netcoreapp1.0": {
"imports": "dnxcore50"
}
},
"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": {}
}
}

10
TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json
View file

@ -27,5 +27,15 @@
"netcoreapp1.0": {
"imports": "dnxcore50"
}
},
"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": {}
}
}

10
TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json
View file

@ -23,5 +23,15 @@
"portable-net45+win8"
]
}
},
"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": {}
}
}

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

@ -6,6 +6,6 @@
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.6": {}
"netstandard1.5": {}
}
}

10
TestAssets/TestProjects/OutputStandardOutputAndError/project.json
View file

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

2
TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json
View file

@ -4,7 +4,7 @@
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.6": {
"netstandard1.5": {
"imports": "dnxcore50"
}
}

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

@ -10,5 +10,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

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

@ -13,6 +13,6 @@
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.6": {}
"netstandard1.5": {}
}
}

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

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

17
TestAssets/TestProjects/TestAppWithContentPackage/project.json
View file

@ -9,11 +9,16 @@
"SharedContentA": "1.0.0-*"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"netstandardapp1.5",
"dnxcore50"
]
}
"netcoreapp1.0": { "imports": ["netstandardapp1.5", "dnxcore50"] }
},
"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": {}
}
}

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

@ -14,5 +14,15 @@
},
"publishOptions": {
"include": "testcontentfile.txt"
},
"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": {}
}
}

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

@ -13,5 +13,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

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

@ -13,6 +13,6 @@
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.6": {}
"netstandard1.5": {}
}
}

10
TestAssets/TestProjects/TestAppWithScripts/project.json
View file

@ -9,6 +9,16 @@
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
},
"scripts": {
"prepublish": [
"echoscript prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?"

10
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json
View file

@ -14,6 +14,16 @@
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
},
"scripts": {
"prepublish": [
"echo prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:Framework%? ?%publish:Runtime%?"

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

@ -12,5 +12,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

10
TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json
View file

@ -13,5 +13,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

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

@ -1,12 +1,11 @@
{
"version": "1.0.0-*",
"testRunner": "xunit",
"dependencies": {
"Newtonsoft.Json": "7.0.1"
},
"frameworks": {
"net451": {},
"netstandard1.6": {
"netstandard1.5": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc3-24113-00"
},

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

@ -1,6 +1,8 @@
{
"version": "1.0.0-*",
"testRunner": "xunit",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Newtonsoft.Json": "6.0.1",
"TestLibraryGreater": {
@ -9,11 +11,15 @@
},
"frameworks": {
"net451": {},
"netstandard1.6": {
"netcoreapp1.0": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc3-24113-00"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"imports": "portable-net45+win8"
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {}
}
}

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

@ -8,6 +8,6 @@
}
},
"frameworks": {
"netstandard1.6": {}
"netstandard1.5": {}
}
}

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

@ -16,6 +16,6 @@
"Test": {}
},
"frameworks": {
"netstandard1.6": {}
"netstandard1.5": {}
}
}

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

@ -25,7 +25,7 @@
"System.Xml": {}
}
},
"netstandard1.6": {
"netstandard1.5": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.5.0-rc3-24113-00"

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

@ -7,6 +7,6 @@
"NETStandard.Library": "1.5.0-rc3-24113-00"
},
"frameworks": {
"netstandard1.6": {}
"netstandard1.5": {}
}
}

10
TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json
View file

@ -13,5 +13,15 @@
"Microsoft.CSharp": "4.0.1-rc3-24113-00"
}
}
},
"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": {}
}
}

10
TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json
View file

@ -18,5 +18,15 @@
"Microsoft.CSharp": "4.0.1-rc3-24113-00"
}
}
},
"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": {}
}
}

10
TestAssets/TestProjects/TestMscorlibReference/project.json
View file

@ -12,5 +12,15 @@
"mscorlib": ""
}
}
},
"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": {}
}
}

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

@ -10,5 +10,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

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

@ -6,7 +6,7 @@
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netstandard1.6": {
"netstandard1.5": {
"imports": "dnxcore50"
}
}

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

@ -5,7 +5,7 @@
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netstandard1.6": {
"netstandard1.5": {
"imports": "dnxcore50"
}
}

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

@ -4,7 +4,7 @@
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netstandard1.6": {
"netstandard1.5": {
"imports": "dnxcore50"
}
}

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

@ -4,7 +4,7 @@
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netstandard1.6": {
"netstandard1.5": {
"imports": "dnxcore50"
}
}

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

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

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

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

2
TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json
View file

@ -13,6 +13,6 @@
}
},
"frameworks": {
"netstandard1.6": {}
"netstandard1.5": {}
}
}

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

@ -9,5 +9,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"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": {}
}
}

10
TestAssets/TestProjects/TestSystemCoreReference/project.json
View file

@ -12,5 +12,15 @@
"System": ""
}
}
},
"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": {}
}
}

10
TestAssets/TestProjects/TestSystemReference/project.json
View file

@ -12,5 +12,15 @@
"System.Core": ""
}
}
},
"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": {}
}
}

6
build_projects/dotnet-cli-build/TestTargets.cs
View file

@ -82,8 +82,7 @@ namespace Microsoft.DotNet.Cli.Build
CleanNuGetTempCache();
var dotnet = DotNetCli.Stage2;
dotnet.Restore("--verbosity", "verbose",
"--infer-runtimes",
dotnet.Restore("--verbosity", "verbose",
"--fallbacksource", Dirs.CorehostLocalPackages,
"--fallbacksource", Dirs.CorehostDummyPackages)
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "TestPackages"))
@ -103,8 +102,7 @@ namespace Microsoft.DotNet.Cli.Build
var dotnet = DotNetCli.Stage2;
dotnet.Restore(
"--verbosity", "verbose",
"--infer-runtimes",
"--verbosity", "verbose",
"--fallbacksource", Dirs.TestPackages,
"--fallbacksource", Dirs.CorehostLocalPackages,
"--fallbacksource", Dirs.CorehostDummyPackages)

2
test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs
View file

@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public abstract class TestBase : IDisposable
{
protected const string DefaultFramework = "netcoreapp1.0";
protected const string DefaultLibraryFramework = "netstandard1.6";
protected const string DefaultLibraryFramework = "netstandard1.5";
private TempRoot _temp;
private static TestAssetsManager s_testsAssetsMgr;
private static string s_repoRoot;

5
test/dotnet-build.Tests/BuildOutputTests.cs
View file

@ -199,7 +199,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
// [InlineData("net20", false, true)]
// [InlineData("net40", true, true)]
// [InlineData("net461", true, true)]
[InlineData("netstandard1.6", true, false)]
[InlineData("netstandard1.5", true, false)]
public void MultipleFrameworks_ShouldHaveValidTargetFrameworkAttribute(string frameworkName, bool shouldHaveTargetFrameworkAttribute, bool windowsOnly)
{
var framework = NuGetFramework.Parse(frameworkName);
@ -347,7 +347,8 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
buildResult.Should().Fail();
buildResult.StdErr.Should().Contain("Expected coreclr library not found in package graph. Please try running dotnet restore again.");
buildResult.StdErr.Should().Contain("Can not find runtime target for framework '.NETCoreApp,Version=v1.0' compatible with one of the target runtimes");
buildResult.StdErr.Should().Contain("The project has not been restored or restore failed - run `dotnet restore`");
}
private void CopyProjectToTempDir(string projectDir, TempDirectory tempDir)

2
test/dotnet-build.Tests/IncrementalTestBase.cs
View file

@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
{
public class IncrementalTestBase : TestBase
{
protected readonly string _libraryFrameworkFullName = ".NETStandard,Version=v1.6";
protected readonly string _libraryFrameworkFullName = ".NETStandard,Version=v1.5";
protected readonly string _appFrameworkFullName = ".NETCoreApp,Version=v1.0";
protected virtual string MainProject

2
test/dotnet-build.Tests/ProjectNameArgumentTests.cs
View file

@ -123,7 +123,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
result.Should().Pass();
foreach (var expectedProject in expectedProjects)
{
result.Should().HaveSkippedProjectCompilation(expectedProject, NuGetFramework.Parse("netstandard1.6").DotNetFrameworkName);
result.Should().HaveSkippedProjectCompilation(expectedProject, NuGetFramework.Parse("netstandard1.5").DotNetFrameworkName);
}
}
else

8
test/dotnet-pack.Tests/PackTests.cs
View file

@ -92,7 +92,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
File.Exists(outputPackage).Should().BeTrue(outputPackage);
var zip = ZipFile.Open(outputPackage, ZipArchiveMode.Read);
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.6/TestLibraryWithConfiguration.dll");
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.5/TestLibraryWithConfiguration.dll");
}
[Fact]
@ -127,13 +127,13 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
var outputPackage = Path.Combine(testInstance.TestRoot, "bin", "Debug", "LibraryWithOutputAssemblyName.1.0.0.nupkg");
File.Exists(outputPackage).Should().BeTrue(outputPackage);
var zip = ZipFile.Open(outputPackage, ZipArchiveMode.Read);
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.6/MyLibrary.dll");
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.5/MyLibrary.dll");
var symbolsPackage = Path.Combine(testInstance.TestRoot, "bin", "Debug", "LibraryWithOutputAssemblyName.1.0.0.symbols.nupkg");
File.Exists(symbolsPackage).Should().BeTrue(symbolsPackage);
zip = ZipFile.Open(symbolsPackage, ZipArchiveMode.Read);
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.6/MyLibrary.dll");
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.6/MyLibrary.pdb");
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.5/MyLibrary.dll");
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandard1.5/MyLibrary.pdb");
}
[Fact]

16
test/dotnet-publish.Tests/PublishTests.cs
View file

@ -193,20 +193,14 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
}
[Fact]
public void PublishedLibraryShouldOutputDependenciesAndNoHost()
public void PublishedLibraryWithoutRIDShouldFail()
{
TestInstance instance = TestAssetsManager.CreateTestInstance(Path.Combine("TestAppWithLibrary"))
.WithLockFiles();
var testProject = _getProjectJson(instance.TestRoot, "TestLibrary");
var publishCommand = new PublishCommand(testProject);
publishCommand.Execute().Should().Pass();
publishCommand.GetOutputDirectory().Should().NotHaveFile("TestLibrary.exe");
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibrary.dll");
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibrary.pdb");
// dependencies should also be copied
publishCommand.GetOutputDirectory().Should().HaveFile("System.Runtime.dll");
publishCommand.Execute().Should().Fail();
}
[WindowsOnlyFact()]
@ -221,16 +215,16 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
var publishCommand = new PublishCommand(lesserTestProject, "net451");
publishCommand.Execute().Should().Pass();
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.dll");
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.exe");
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.pdb");
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.dll.config");
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.exe.config");
publishCommand.GetOutputDirectory().Should().NotHaveFile("TestLibraryLesser.deps.json");
// dependencies should also be copied
publishCommand.GetOutputDirectory().Should().HaveFile("Newtonsoft.Json.dll");
publishCommand.GetOutputDirectory().Delete(true);
publishCommand = new PublishCommand(lesserTestProject, "netstandard1.6", RuntimeEnvironmentRidExtensions.GetLegacyRestoreRuntimeIdentifier());
publishCommand = new PublishCommand(lesserTestProject, "netcoreapp1.0", RuntimeEnvironmentRidExtensions.GetLegacyRestoreRuntimeIdentifier());
publishCommand.Execute().Should().Pass();
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.dll");