tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-06-19 09:18:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

merged develop and stolen binarymash dont publish unstable build script code

Browse Source
This commit is contained in:
TomPallister
2017-02-25 18:27:20 +00:00
parent c2f98f0d69 040f2daae0
commit d33e0c6f3b
46 changed files with 2985 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/Ocelot.Benchmarks/project.json
View File

@ -9,10 +9,10 @@
"BenchmarkDotNet": "0.10.2"
},
"runtimes": {
"win10-x64": {},
"osx.10.11-x64":{},
"osx.10.12-x64": {},
"win7-x64": {}
"osx.10.12-x64":{},
"win7-x64": {},
"win10-x64": {}
},
"frameworks": {
"netcoreapp1.1": {

28
test/Ocelot.Benchmarks/project.json.orig Normal file
View File

@ -0,0 +1,28 @@
{
"version": "0.0.0-dev",
"buildOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Ocelot": "0.0.0-dev",
"BenchmarkDotNet": "0.10.2"
},
"runtimes": {
"osx.10.11-x64":{},
<<<<<<< HEAD
"osx.10.12-x64": {},
"win7-x64": {}
=======
"osx.10.12-x64":{},
"win7-x64": {},
"win10-x64": {}
>>>>>>> develop
},
"frameworks": {
"netcoreapp1.1": {
"imports": [
]
}
}
}