huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
37,440 Commits 1 Branch 0 Tags 251 MiB
Commit Graph

37440 Commits

Author SHA1 Message Date
Ajay Bhargav Baaskaran 970dbfd9d5 Resolve bad merge 2018-10-30 15:14:07 -07:00
Nate McMaster a705aae147
Merge branch 'release/2.1' into release/2.2 2018-10-30 15:07:46 -07:00
Chris Ross (ASP.NET) 2451b68ca0 Rewrite Listener.ResponseSendFileTests 2018-10-30 14:58:23 -07:00
Ajay Bhargav Baaskaran a80f145c6b Merge branch 'release/2.2' 2018-10-30 14:56:09 -07:00
Nate McMaster 9405d058fa
Merge branch 'release/2.1' into release/2.2 2018-10-30 14:54:51 -07:00
Pranav K 734b919b02 Respect SuppressInferBindingSourcesForParameters 
Fixes https://github.com/aspnet/Mvc/issues/8657
 2018-10-30 14:37:21 -07:00
Pranav K 3dcf5a04b8 Remove Microsoft.AspNetCore.Razor.Design 2018-10-30 14:30:23 -07:00
Pranav K 0bd6d135c1 Move targets, rzc and extension assembly in to the Sdk 2018-10-30 14:30:20 -07:00
ASP.NET CI a0fdca9a78 Updating BuildTools from 2.1.3-rtm-15833 to 2.1.3-rtm-15834 
[auto-updated: buildtools]
 2018-10-30 14:14:50 -07:00
BrennanConroy c9600ac2d4
[Java] Log invocation binding failures (#3160) 2018-10-30 13:49:43 -07:00
Pranav K 16b15fcb2a
Merge pull request #8672 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-10-30 13:33:07 -07:00
Piotr Wosiek af6527dcef Fix XML doc on HttpMethodAttribute and derived ones 2018-10-30 13:21:15 -07:00
Ajay Bhargav Baaskaran 8e62dbcae9 Change testing strategy for build server shutdown test 2018-10-30 13:20:33 -07:00
Pranav K be53aa9cac Remove skipped test 
Fixes https://github.com/aspnet/AspNetCore/issues/3597
 2018-10-30 13:15:06 -07:00
Hao Kung 93799664bb
Merge pull request #2031 from dotnet-maestro-bot/merge/release/2.2-to-master 2018-10-30 12:57:29 -07:00
John Luo d05ef9be3a Merge branch 'release/2.2' 2018-10-30 12:50:46 -07:00
Chris Ross (ASP.NET) 7974467dc9 Cleanup server limits tests #472 #476 #469 2018-10-30 12:35:26 -07:00
Filip W 187e89f6f0 Do not throw a null reference from request.GetDisplayUrl() (#1057) 2018-10-30 12:32:26 -07:00
Ajay Bhargav Baaskaran 0948660e8c Merge branch 'release/2.2' 2018-10-30 12:07:04 -07:00
ASP.NET CI 6b894d9c28 Updating submodule(s) 
EntityFrameworkCore => 69e54addd48783e2219a239b2c03933b48e83071

[auto-updated: submodules]
 2018-10-30 12:04:26 -07:00
ASP.NET CI dec1ef91b4 Updating submodule(s) 
Diagnostics => 3e6b3a0067
EntityFrameworkCore => 19f7304271b8586629afba2edde16c25eaef4589
Hosting => d7b9fd4807
Logging => b1e18f01e94a06414c610312b01d5a5f8f5d6220
Mvc => 4015c9863e
Razor => 6c1bee1940
ServerTests => 3fb2949b51
SignalR => e0f547e211

[auto-updated: submodules]
 2018-10-30 12:04:14 -07:00
Nate McMaster d7b9fd4807
Update TFM to include netcoreapp3.0 2018-10-30 11:26:46 -07:00
Nate McMaster 969fb9bf48
Update projects in src/Framework/ to netcoreapp3.0 2018-10-30 10:41:24 -07:00
Arthur Vickers 21135444c5
Mark cosmos as ship again for 3.0 (#3749) 2018-10-30 09:49:27 -07:00
ASP.NET CI 50cc4fa178 Updating submodule(s) 
Diagnostics => 4c94bc272b
EntityFrameworkCore => cdc92acdc172a4fb4a822e924b475dd4e54f621f
SignalR => 73f2f19984

[auto-updated: submodules]
 2018-10-30 00:05:02 -07:00
BrennanConroy e0f547e211
Merge pull request #3226 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-10-29 19:41:42 -07:00
Ryan Nowak 3e6b3a0067
Merge pull request #521 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-10-29 17:03:14 -07:00
John Luo e958d82584 Add more chrome test logging 
- fix an issue with tests running as root on VSTS
 2018-10-29 16:56:10 -07:00
BrennanConroy 73f2f19984
[Java] API level support down to 23 2018-10-29 16:53:47 -07:00
Nate McMaster 1756f17337
Merge branch 'release/2.2' 2018-10-29 16:49:45 -07:00
Nate McMaster 97dc5852a2
Suppress warning NU5125 about upcoming deprecation of PackageLicenseUrl (#3758) 2018-10-29 16:45:04 -07:00
Ryan Nowak 4c94bc272b Rename anti-caching option 
- Renamed the property for configuration response caching headers
- Renamed the options class to avoid conflicts with other type names

Fixes https://github.com/aspnet/Diagnostics/issues/509
 2018-10-29 16:44:45 -07:00
Nate McMaster 5e4166f940
Merge branch 'release/2.2' 2018-10-29 16:05:19 -07:00
Nate McMaster 89700b9644
docs: Minor tweaks to documentation on the shared framework 2018-10-29 15:45:48 -07:00
Nate McMaster 4e44e5bcbe
docs: Add guidance for how we decide on what goes into the shared framework 2018-10-29 15:20:22 -07:00
Ryan Nowak 6c1bee1940 Classify non-C# inside C# 
Fixes a bug with preview formatting for FAR.

So when we ask the Roslyn API to classify C# for us, it will only
classify the actual C# tokens. We are responsible for filling in the
gaps and whitespace.

The bug is that the following text would have all of its whitespace
removed in the VS FAR preview window.

```
@{ var foo = "Hello, world!"; }
```

Would look like:
```
@{varfoo="Hello, world!";}
```

This fixes the issue and makes it look like what one would expect.
 2018-10-29 14:35:13 -07:00
Ryan Nowak a3d0c8f634 Fixes for excerpt service 
We had a bug where were not returning the correct span for highlighting.
Fixed this.

Also we have a problem here, we're using types in our tests that are
coming from Roslyn - however we're not getting IVT for our test
assemblies. So some additional pain is required.
 2018-10-29 14:35:13 -07:00
Ryan Nowak 5229e65962 Add GeneratedDocumentTextLoader 2018-10-29 14:35:13 -07:00
Ryan Nowak e637e17d34 Add support for getting the output version 
This was missed in an earlier PR.
 2018-10-29 14:35:13 -07:00
ASP.NET CI 6db081fff7 Updating submodule(s) 
SignalR => 1edf818104

[auto-updated: submodules]
 2018-10-29 13:37:22 -07:00
Mikael Mengistu 1edf818104 Remove hidden BiConsumer reference (#3215) 2018-10-29 13:33:19 -07:00
Pranav K 4015c9863e
Merge pull request #8664 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-10-29 12:54:42 -07:00
John Luo a058bc0c0a Win-arm shared framework 2018-10-29 12:54:38 -07:00
Chris Ross 3fb2949b51 Enable trace logging for nginx scenarios 2018-10-29 12:09:12 -07:00
ASP.NET CI f3e4d442ac Updating BuildTools from 2.2.0-preview2-20181027.2 to 2.2.0-preview2-20181029.2 
[auto-updated: buildtools]
 2018-10-29 12:04:22 -07:00
ASP.NET CI acce5fe965 Updating BuildTools from 3.0.0-alpha1-20181026.5 to 3.0.0-alpha1-20181029.3 
[auto-updated: buildtools]
 2018-10-29 12:04:14 -07:00
ASP.NET CI 0855b08f34 Updating submodule(s) 
EntityFrameworkCore => f2b5430c3cb589e5bd515b44be9cdd0ad07748e0
Mvc => 35d2ab37f7
Razor => 8674dd9236
SignalR => 9407fe12f6

[auto-updated: submodules]
 2018-10-29 12:04:14 -07:00
ASP.NET CI 45f684318e Updating submodule(s) 
EntityFrameworkCore => 647aed13836f1f4f0d3c3d7f6a9a0165826e3e6a
Logging => cc90113f450182d472ae155767ff388fc92698e8
Mvc => 13cf754425
Razor => 4d44639a51

[auto-updated: submodules]
 2018-10-29 12:04:06 -07:00
BrennanConroy 9407fe12f6
RxJava is on the public API so the library needs to declare it as such (#3155) 2018-10-29 11:43:01 -07:00
Ajay Bhargav Baaskaran 8674dd9236 Removed duplocate Id for a RazorDiagnostic 2018-10-29 11:25:29 -07:00