Steve Sanderson
cf9d109876
Merge pull request #50 from tzachov/patch-2
...
Use "nameof" instead of string
2016-04-28 11:14:46 +01:00
Justin Van Patten
68f14c06cb
Use Task.FromCanceled<TResult>() on NETSTANDARD1_3
...
Task.FromCanceled<int>(cancellationToken) can be used on
NETSTANDARD1_3 in TaskUtilities.GetCancelledZeroTask().
2016-04-27 22:26:31 -07:00
BrennanConroy
34da518d2c
Merge branch 'release' into dev
2016-04-27 19:07:13 -07:00
BrennanConroy
d1f7bb32c7
Remove reference to UseDefaultHostingConfiguration
2016-04-27 19:07:01 -07:00
BrennanConroy
b457fb47d3
Merge branch 'release' into dev
2016-04-27 19:04:45 -07:00
BrennanConroy
3615cfd28e
Remove reference to UseDefaultHostingConfiguration
2016-04-27 19:04:33 -07:00
BrennanConroy
74bd220987
Merge branch 'release' into dev
2016-04-27 19:00:09 -07:00
BrennanConroy
f4452846cf
Remove reference to UseDefaultHostConfiguration
2016-04-27 18:59:59 -07:00
BrennanConroy
efd5b9fc53
Merge branch 'release' into dev
2016-04-27 18:59:44 -07:00
BrennanConroy
5a8d55fa0c
Remove reference to UseDefaultHostConfiguration
2016-04-27 18:59:33 -07:00
BrennanConroy
f570b0e739
Merge branch 'release' into dev
2016-04-27 18:58:00 -07:00
BrennanConroy
0a538c563b
Remove reference to UseDefaultHostConfiguration
2016-04-27 18:57:52 -07:00
BrennanConroy
7232621646
Merge branch 'release' into dev
2016-04-27 18:45:54 -07:00
BrennanConroy
d7e509ebec
Remove reference to UseDefaultHostConfiguration
2016-04-27 18:45:43 -07:00
BrennanConroy
0458a9140a
Merge branch 'release' into dev
2016-04-27 18:43:22 -07:00
BrennanConroy
afd437f85f
Remove reference to UseDefaultHostConfiguration
2016-04-27 18:43:11 -07:00
BrennanConroy
fbd7110da0
Merge branch 'release' into dev
2016-04-27 18:38:50 -07:00
BrennanConroy
df7be69e85
Remove references to UseDefaultHostConfiguration
2016-04-27 18:38:34 -07:00
Filip W
f567258f14
changed GetFormat to virtual
2016-04-27 18:08:45 -07:00
Pranav K
98846a4cc7
Merge branch 'release' into dev
2016-04-27 17:34:21 -07:00
Pranav K
5135ee9d2d
Fixing CI build break
2016-04-27 17:34:01 -07:00
Ajay Bhargav Baaskaran
e74aa54d95
React to aspnet/Razor#738
2016-04-27 16:54:16 -07:00
BrennanConroy
afc3576e3d
Merge branch 'release' into dev
2016-04-27 16:30:36 -07:00
BrennanConroy
5a34796463
Remove reference to UseDefaultHostingConfiguration
2016-04-27 16:30:18 -07:00
BrennanConroy
22b4dfdb89
Merge branch 'release' into dev
2016-04-27 16:26:36 -07:00
BrennanConroy
693f58c18f
Remove references to UseDefaultHostingConfiguration
2016-04-27 16:26:23 -07:00
John Luo
453e4821ac
Merge branch 'release' into dev
2016-04-27 15:39:16 -07:00
John Luo
3aa2febb6f
Remove references to UseDefaultHostingConfiguration
2016-04-27 15:39:07 -07:00
John Luo
f38ac2afff
Merge branch 'release' into dev
2016-04-27 15:28:31 -07:00
John Luo
bb7290e9e1
Remove references to UseDefaultConfiguration
2016-04-27 15:28:21 -07:00
BrennanConroy
0ed54e9165
Merge branch 'release' into dev
2016-04-27 15:06:43 -07:00
BrennanConroy
8a74260217
Remove references to UseDefaultHostingConfiguration
2016-04-27 15:06:31 -07:00
John Luo
fae70a2bfe
Merge branch 'release' into dev
2016-04-27 14:59:59 -07:00
John Luo
57352541fb
Removing references to UseDefaultHostingConfiguration
2016-04-27 14:59:24 -07:00
Doug Bunting
d8d2e54506
Remove extra options to manipulate `JsonSerializerSettings`
...
- #4339 : remove non-recommended JSON formatter constructors
- affects `JsonInputFormatter`, `JsonOutputFormatter`, `JsonPatchInputFormatter`
- `JsonOutputFormatter` cleanup also impacts `JsonHelper`
- rename and make `SerializerSettingsProvider` class public; use it as appropriate
- #4409 : make `SerializerSetings` properties get-only and `protected`
- affects `JsonInputFormatter`, `JsonOutputFormatter`
Recommended patterns:
- change `JsonSerializerSettings` values in `MvcJsonOptions` for almost all customizations
- find `JsonOutputFormatter` in `MvcOptions.OutputFormatters` when limiting per-result formatters
- start with `JsonSerializerSettingsProvider.CreateSerializerSettings()` when customizing a per-result formatter
2016-04-27 14:48:16 -07:00
John Luo
9479f0910a
Merge branch 'release' into dev
2016-04-27 14:04:41 -07:00
Pranav K
029df37ca7
Merge branch 'release' into dev
2016-04-27 12:09:20 -07:00
Pranav K
846b242327
Add more rids so build succeeds on OSX and Linux
2016-04-27 12:08:52 -07:00
John Luo
0d2c5135cb
Merge branch 'release' into dev
2016-04-27 11:56:53 -07:00
Korroz
3b262b1b3b
Content type mapping for markdown
...
Since it is now officially registered.
See: https://tools.ietf.org/html/rfc7763
2016-04-27 11:50:20 -07:00
John Luo
e505ecbc21
#700 #727 Add environment variables by default and remove UseDefaultHostingConfiguration
2016-04-27 11:40:22 -07:00
John Luo
e344edc2a3
React to default hosting configuration changes
2016-04-27 11:36:23 -07:00
Cesar Blum Silveira
5a8cba878d
Merge branch 'benaadams/async-write' into dev
2016-04-27 11:25:45 -07:00
Pranav K
701e5af5a2
Merge branch 'release' into dev
2016-04-27 11:16:26 -07:00
John Luo
98bf64819e
Merge branch 'release' into dev
2016-04-27 11:13:58 -07:00
Pranav K
521fd593f0
Merge branch 'release' into dev
2016-04-27 11:05:27 -07:00
Pranav K
c7893f9f5a
Make TestSites portable
2016-04-27 11:03:28 -07:00
Pranav K
d4fbbd02d0
Add rid that matches build agents
2016-04-27 11:01:47 -07:00
John Luo
c3d8a00c11
Remove DNX branding from footer
2016-04-27 10:42:11 -07:00
Kiran Challa
f7d5a1faf2
Merge branch 'release' into dev
2016-04-27 10:32:37 -07:00