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

27675 Commits

Author SHA1 Message Date
Pavel Krymets df6471f462
Add startup filter to detect overriden server (#740) 2018-03-29 16:23:17 -07:00
ASP.NET CI 4b6fb44ecd Updating submodule(s) 
Razor => 13d19845c4
SignalR => ba1d4b771c
Templating => c0c28fb9f1

[auto-updated: submodules]
 2018-03-29 22:14:44 +00:00
BrennanConroy ba1d4b771c
Merge pull request #1771 from aspnet/release/2.1 
Move Cpp Client to main repo (#1703)
 2018-03-29 14:59:20 -07:00
BrennanConroy 476d337989
Move Cpp Client to main repo (#1703) 2018-03-29 14:58:54 -07:00
ASP.NET CI 18c33f8742 Updating submodule(s) 
Microsoft.Data.Sqlite => 2b9f77f914c70f37add0a5cdea641bce4ec42db7
Razor => a2a920dde5
Templating => 2f9ce959ea

[auto-updated: submodules]
 2018-03-29 21:46:19 +00:00
Jass Bagga c0c28fb9f1 Merge branch 'release/2.1' into dev 2018-03-29 14:40:40 -07:00
Jass Bagga 2f9ce959ea
Target net461 for all tests (#420) 2018-03-29 14:38:47 -07:00
Ajay Bhargav Baaskaran 13d19845c4 Merge branch 'release/2.1' into dev 2018-03-29 14:37:28 -07:00
Jass Bagga cf135a2e03 Merge branch 'release/2.1' into dev 2018-03-29 14:11:05 -07:00
Pranav K effdc47246
Update dependencies.props 2018-03-29 14:07:02 -07:00
ASP.NET CI 1d048f2708 Updating submodule(s) 
EntityFrameworkCore => 27a3761b53b81033d7ab2f5e5710bd8a4476b020
Microsoft.Data.Sqlite => fe42de6d85df921a4609663ea95d00785b4729c6
Templating => 79cc52d903

[auto-updated: submodules]
 2018-03-29 21:05:43 +00:00
Jass Bagga cb7942abe4
Add no-https option for all templates (#413) 
Addresses #322
 2018-03-29 13:59:47 -07:00
Jass Bagga 79cc52d903
Merge pull request #418 from aspnet/release/2.1 
--no-https option for RazorPagesWeb-CSharp template (#362)
 2018-03-29 13:49:46 -07:00
Jass Bagga aca30fe8a2
--no-https option for RazorPagesWeb-CSharp template (#362) 2018-03-29 13:49:20 -07:00
ASP.NET CI bcd2c2800c Updating submodule(s) 
EntityFrameworkCore => 410d43d7a75c3f5b98052361abc27ab60063cb4c
Microsoft.Data.Sqlite => 79153c93481a1980ea027b01e14617525f98e25b
Templating => 5ae68a012c

[auto-updated: submodules]
 2018-03-29 13:36:01 -07:00
ASP.NET CI d52eda32d0 Updating submodule(s) 
EntityFrameworkCore => c4e8182112bc6623c4e567a5e24a29f7511bf76e

[auto-updated: submodules]
 2018-03-29 13:23:28 -07:00
Ajay Bhargav Baaskaran a2a920dde5 Normalize the tool assembly path before using it as the base for pipe name 2018-03-29 12:50:51 -07:00
ASP.NET CI 53fea0db6c Updating submodule(s) 
EntityFrameworkCore => 7dfd88f858c852de326bcf6aa19b7aa50e8999ac
Templating => f166d0b8a8

[auto-updated: submodules]
 2018-03-29 19:34:10 +00:00
ASP.NET CI 68c01d4ccd Updating submodule(s) 
EntityFrameworkCore => 05ef882dd8677c248ec0a95254f0f0d9d746fb82
IISIntegration => 199c70b72e

[auto-updated: submodules]
 2018-03-29 12:25:17 -07:00
Pranav K f166d0b8a8
Merge remote-tracking branch 'origin/release/2.1' into dev 
# Conflicts:
#	build/dependencies.props
#	korebuild-lock.txt
 2018-03-29 12:23:18 -07:00
Pranav K 5ae68a012c Re-enable F# template tests 
Fixes https://github.com/aspnet/templating/issues/365
 2018-03-29 12:21:35 -07:00
Pavel Krymets 199c70b72e
Reenable ReadAndWriteEchoTwice test (#739) 2018-03-29 12:14:23 -07:00
ASP.NET CI 4643b97e23 Updating submodule(s) 
AzureIntegration => 2a64c1953d
EntityFrameworkCore => b840c9cdca075bf7faa91f3cf836f0116d3fa6ca
HttpSysServer => 988972e1e5
SignalR => a4d0bf2e3a

[auto-updated: submodules]
 2018-03-29 18:18:40 +00:00
Ryan Brandenburg 2a64c1953d Skip broken tests 2018-03-29 11:02:57 -07:00
ASP.NET CI b26e9d7924 Updating submodule(s) 
HttpSysServer => 41f74bb9ea
SignalR => 0285549aaa

[auto-updated: submodules]
 2018-03-29 10:50:47 -07:00
Andrew Stanton-Nurse 0285549aaa
Merge pull request #1769 from aspnet/release/2.1 
collect log messages during browser tests (#1670)
 2018-03-29 10:11:35 -07:00
Andrew Stanton-Nurse a4d0bf2e3a
collect log messages during browser tests (#1670) 2018-03-29 10:11:18 -07:00
David Fowler 80b842e987 Merge branch 'release/2.1' into dev 2018-03-29 10:05:30 -07:00
David Fowler 7a53e07623
Parse data as it comes in off the wire in the .NET client and server (#1766) 
- Change websockets and the POST end point to send data unbuffered.
- Update tests to handle partial frames
 2018-03-29 10:03:59 -07:00
ASP.NET CI a438d75b69 Updating submodule(s) 
KestrelHttpServer => cc8c140cca

[auto-updated: submodules]
 2018-03-29 17:01:16 +00:00
Chris Ross (ASP.NET) 41f74bb9ea Merge branch 'release/2.1' into dev 2018-03-29 10:00:50 -07:00
Nate McMaster 19c7c1beec
Add MSBuild namespace to generated dependencies.props file 2018-03-29 09:45:31 -07:00
ASP.NET CI caeeb5402e Updating BuildTools from 2.1.0-preview3-17001 to 2.1.0-preview3-17002 
[auto-updated: buildtools]
 2018-03-29 16:40:08 +00:00
ASP.NET CI 5f915b59c5 Updating submodule(s) 
KestrelHttpServer => 4592227d07

[auto-updated: submodules]
 2018-03-29 16:39:59 +00:00
Chris Ross (ASP.NET) 988972e1e5 Disable regressed negotiate test #439 2018-03-29 09:06:27 -07:00
Chris Ross (ASP.NET) 4592227d07 Merge branch 'release/2.1' into dev 2018-03-29 08:50:40 -07:00
ASP.NET CI 844f1b0cd0 Updating submodule(s) 
Mvc => d360886b78

[auto-updated: submodules]
 2018-03-29 08:49:40 -07:00
Ryan Brandenburg cc8c140cca Skip flaky test 2018-03-29 08:48:40 -07:00
ASP.NET CI b727ed4d9e Updating submodule(s) 
Mvc => 24eaa740f5

[auto-updated: submodules]
 2018-03-29 15:27:22 +00:00
Doug Bunting 24eaa740f5
Merge pull request #7570 from aspnet/release/2.1 
Merge to `dev`: Restore `ModelMetadata.PropertyName != null` behaviour
- and: Fix #7558 infer [FromRoute] with parameter in ANY route
 2018-03-29 08:22:37 -07:00
Ryan Nowak d360886b78 Fix #7558 infer [FromRoute] with parameter in ANY route 
This changes the logic for when we infer [FromRoute] on an action
parameter from *ALL* to *ANY*.

This means that if a parameter occurs in any route on an ApiController,
we will treat it as [FromRoute]. We think this is the best decision
because it's less ambiguous. If a parameter appears in a route, it won't
be eligible to be bound from query. I think that's good.

If for some reason you want this kind of behavior (route or query) then
we suggest breaking up the actions. This isn't very documentation
friendly (swagger) so we don't suggest it.
 2018-03-29 07:54:39 -07:00
ASP.NET CI b845420ce5 Updating submodule(s) 
Mvc => fc3a815e57

[auto-updated: submodules]
 2018-03-29 14:39:42 +00:00
Doug Bunting fc3a815e57
Restore `ModelMetadata.PropertyName != null` behaviour 
- #7413 part 2 of 2
- add `ModelMetadata.Name` and `ParameterName`
  - use `Name` instead of `PropertyName` in most cases
- update `ModelMetadata.ContainerType` and other property use
  - choose using `MetadataKind` almost everywhere; support all possibilties
    - usually parameter metadata was possible but not handled
    - worst case was one or two potential NREs, especially `ContainerType.*` dereferences
  - improve `MvcCoreLoggerExtensions` metadata handling
    - add three new debug messages, one for type metadata and two for parameter metadata
- update `ModelMetadata.ContainerMetadata`, `ContainerType` and `PropertyName` doc comments
- no changes needed in Microsoft.AspNetCore.Mvc.ViewFeatures because parameters aren't viewed

nits:
- add missing `TestModelMetadataProvider.ForParameter(...)` method
- remove unused `EmptyModelMetadataProvider` instances in `ModelMetadataTest`
- refactor `ModelValidationResultComparer` out of DataAnnotationsModelValidatorTest`
- take VS suggestions, mostly related to variable inlining and object initializers
 2018-03-29 07:22:00 -07:00
ASP.NET CI dca71f67f3 Updating submodule(s) 
SignalR => 2f9942e1f2

[auto-updated: submodules]
 2018-03-29 07:36:55 +00:00
ASP.NET CI 8ece5a52cb Updating submodule(s) 
SignalR => cddf46c0cd

[auto-updated: submodules]
 2018-03-29 00:31:02 -07:00
James Newton-King 2f9942e1f2
Merge pull request #1765 from aspnet/release/2.1 
Make HubConnection write messages directly to the PipeWriter (#1762)
 2018-03-29 20:27:14 +13:00
James Newton-King cddf46c0cd
Make HubConnection write messages directly to the PipeWriter (#1762) 2018-03-29 20:26:09 +13:00
ASP.NET CI eaae870fc1 Updating submodule(s) 
SignalR => eaaaeb1ba3

[auto-updated: submodules]
 2018-03-28 23:11:24 -07:00
BrennanConroy eaaaeb1ba3
Upgrade deps (#1761) 2018-03-28 22:01:22 -07:00
ASP.NET CI ab1bee2159 Updating submodule(s) 
SignalR => a4dd4da7a2

[auto-updated: submodules]
 2018-03-28 21:59:56 -07:00