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

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

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

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

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": {}
}
}

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": {}
}
}

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": {}
}
}

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": {}
}
}

View file

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

View file

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

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": {}
}
}

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": {}
}
}

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": {}
}
}

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": {}
}
}

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": {}
}
}

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": {}
}
}

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": {}
}
}

View file

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

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": {}
}
}

View file

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

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": {}
}
}

View file

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

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": {}
}
}

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": {}
}
}

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": {}
}
}

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": {}
}
}

View file

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

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%?"

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%?"

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": {}
}
}

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": {}
}
}

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

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": {}
}
}

View file

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

View file

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

View file

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

View file

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

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": {}
}
}

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": {}
}
}

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": {}
}
}

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": {}
}
}

View file

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

View file

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

View file

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

View file

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

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": {}
}
}

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": {}
}
}

View file

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

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": {}
}
}

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": {}
}
}

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": {}
}
}