Merge branch 'release' into dev

This commit is contained in:
Pranav K 2016-04-08 06:49:24 -07:00
commit 8f8d5f0940
4 changed files with 6 additions and 19 deletions

View File

@ -24,11 +24,7 @@
"Microsoft.Extensions.Options": "1.0.0-*"
},
"frameworks": {
"net451": { },
"netstandard1.3": {
"imports": [
"dotnet5.4"
]
}
"net451": {},
"netstandard1.3": {}
}
}

View File

@ -23,10 +23,7 @@
"System.Collections.Concurrent": "4.0.12-*",
"System.Linq": "4.1.0-*",
"System.Resources.ResourceManager": "4.0.1-*"
},
"imports": [
"dotnet5.2"
]
}
}
}
}

View File

@ -22,10 +22,7 @@
"Microsoft.CSharp": "4.0.1-*",
"System.Globalization": "4.0.11-*",
"System.Resources.ResourceManager": "4.0.1-*"
},
"imports": [
"dotnet5.1"
]
}
}
}
}

View File

@ -23,15 +23,12 @@
"Microsoft.Extensions.Options": "1.0.0-*"
},
"frameworks": {
"net451": { },
"net451": {},
"netstandard1.3": {
"dependencies": {
"System.Collections.Concurrent": "4.0.12-*",
"System.Resources.Reader": "4.0.0-*"
},
"imports": [
"dotnet5.4"
]
}
}
}
}