Commit Graph

15757 Commits

Author SHA1 Message Date
Mikael Mengistu 86a0becd59
Mark Java client as Product Package (#6697) 2019-01-14 21:24:52 -08:00
John Luo 38c0d5a50c
Use object indirection in HttpContextAccessor (#1066) (#6036) 2019-01-14 20:31:36 -08:00
Doug Bunting 63ee551b6b
Merge `release/2.2` to `master` 2019-01-14 20:23:51 -08:00
John Luo 8f1eedf5a9 Merge branch 'release/2.1' into release/2.2 2019-01-14 19:04:39 -08:00
BrennanConroy a9b737b793
Fix broken definitions file (#6343) 2019-01-14 18:46:07 -08:00
Pranav K d93f4527b3 Fix typo
Fixes https://github.com/aspnet/AspNetCore/issues/6535
2019-01-14 17:15:19 -08:00
Steve Sanderson 864f76b2c0
Update Razor Components and Blazor templates (#6682) 2019-01-14 15:23:49 -08:00
Travis Illig f072523780 Minor argument check fixes
Fixed `nameof()` reference to be consistent with arg being checked. Added null check for port to be consistent with earlier overload.
2019-01-14 15:00:20 -08:00
Kahbazi 5b8d93c9c6 Check iss in odic sign-out (#6378) 2019-01-14 14:45:45 -08:00
David Fowler 3f1760c52b
Reduce copies for WebSocket reads (#6656)
- Change the upgrade message body to use the transport pipe instead of the request body pipe.
- Remove some logic from the base type (more can be removed but this is a conservative change)
- Improve performance of the ReadAsync call
2019-01-14 14:14:02 -08:00
John Luo c2aa2957f6 Merge fixes 2019-01-14 14:13:40 -08:00
John Luo 90a9fa7aac Merge branch 'release/2.1' into release/2.2 2019-01-14 12:57:34 -08:00
Stephen Halter cd0eab88ea
Lower log severity for opening internal libuv pipe (#6636)
Addresses #4741
2019-01-14 12:29:49 -08:00
Chris Ross 87af0c3f1f
Update Google Auth UserInfo endpoint (#6338)
* Update Google Auth UserInfo endpoint #6069

* Add Google to PatchConfig
2019-01-14 12:28:25 -08:00
Nate McMaster 7f7723bdf2
Consume dependencies updates automatically via darc (#6676)
This refactors the list of dependency versions to support consuming updates automatically via darc and maestro.
2019-01-14 12:01:31 -08:00
Doug Bunting 970bced25c
Update branding to 2.2.2 (#6608)
- pin System.Net.WebSockets.WebSocketProtocol to version 4.5.3
- update Directory.Build.targets files to correct build issues
- fix duplicate metadata during static analysis
2019-01-14 11:40:01 -08:00
Ivan Zlatanov c560edee28 Fixed the bug in the windows service host where if application stop is requested, the service wouldn't know about it. (#4553)
* Fixed the bug in the windows service host where if application stop is requested, the service wouldn't know about it.

* Fixed a typo.

* Update src/Hosting/WindowsServices/test/Microsoft.AspNetCore.Hosting.WindowsServices.Tests.csproj

* Removed unneeded EditorBrowsable for internal API.

* Fixed tests to ignore Linux and MacOS.

* Added new line to end of file.

* Using [ConditionalFact] instead of [Fact].
2019-01-14 10:26:15 -08:00
Nate McMaster 089912cd1b
Switch queues used during Windows builds (#6667) 2019-01-14 10:07:12 -08:00
Pavel Krymets 8aa8c6b2b0
Build branch logging SE in main build (#6312) 2019-01-14 08:42:53 -08:00
Justin Kotalik 3f4622ffe0
Fix StartupTests.StartsWithDotnetInstallLocation (#6589) 2019-01-14 08:16:48 -08:00
Steve Sanderson cbbdeaefd4
Enforce correct sync context on render, and allow explicit dispatch to sync context. Fixes #5639 (#6604)
* Only use async marshalling to renderer sync context when necessary

Note that the lifecycle methods already take care of capturing the correct sync context, so continuations will already be serialized.
Avoiding an extra layer of asynchrony keeps the semantics of rendering closer to the WebAssembly cases, and will fix a range of intermittent errors in the wild.

* Add E2E test of triggering rendering from outside the sync context

* Actually throw if attempting to render from incorrect sync context

* Add "Dispatch" API

* Handle dispatch within dispatch. Also test Dispatch on WebAssembly.

* Avoid heap allocation

* Simplify E2E test

* Replace Dispatch() with Invoke() and InvokeAsync()

* Add E2E test to validate async execution order

* Clean up
2019-01-14 15:31:53 +00:00
Chris Baudin 0b8e16f10a Detatch CancelKeyPress and ProcessExit event handlers when IWebHost.RunAsync is completed. (#6638) 2019-01-13 22:44:25 -08:00
Ryan Nowak a5658a8c95
Fix #6102 - Intense CPU utilization on page change (#6542)
* Fix #6102 - Intense CPU utilization on page change

The issue here was that every time a Razor Page changed, we would
subscribe an additional time to the endpoint change notifications. This
means that if you tweaked a page 30 times, we would update the address
table 31 times when you save the file. If you were doing a lot of editing
then this would grow to a really large amount of computation.

The fix is to use DataSourceDependentCache, which is an existing utility
type we developed for this purpose. I'm not sure why it wasn't being
used for this already. We're already using DataSourceDependentCache in a
bunch of other places, and it's well tested.

I also tweaked the stucture of this code to be more similar to
EndpointNameAddressScheme. This involved some test changes that all
seemed like good cleanup. The way this was being tested was a little
wonky.
2019-01-13 21:03:26 -08:00
David Fowler 71ce37ee91 Remove WebSocketProtocol dependencies (#6651) 2019-01-13 18:22:11 -08:00
BrennanConroy 6d28c44408
Fix SignalR perf app path (#6650) 2019-01-13 17:11:25 -08:00
David Fowler c528892560
Use the WebSocket factory method instead of WebSocketProtocol (#6646)
- WebSocketProtocol.CreateFromStream makes the netstandard ManagedWebSocket which uses the inefficient versions of Stream overloads.
- Updated the samples to use the new Memory<byte> overloads
2019-01-13 11:05:04 -08:00
Ben Adams b27739ad3f Shrink ParseRequestLine inner loop (#6594) 2019-01-11 20:34:30 -08:00
James Newton-King c7f05c614a
Remove Microsoft.AspNetCore.Testing dependency from SignalR spec tests (#6629) 2019-01-12 16:01:07 +13:00
James Newton-King accbcebac0
Support multiple policies for a key with RoutePatternFactory.Pattern (#6593) 2019-01-12 16:00:42 +13:00
Nate McMaster b4f869b2ff
Switch agent queues used on Windows builds (#6627) 2019-01-11 16:23:13 -08:00
Chris Ross 7d5067519f
Move templates to generic web host #4187 (#5706) 2019-01-11 16:21:23 -08:00
BrennanConroy ee6ba671fa
Fixup SignalR sln (#6622) 2019-01-11 16:05:31 -08:00
Nate McMaster a9132ad26c
Switch agent queues used during Windows builds 2019-01-11 15:16:57 -08:00
Nate McMaster 676cbee9d0
Merge branch 'release/2.2' 2019-01-11 14:52:01 -08:00
Kahbazi 7883eb65a2 Replace Cosnsole.WriteLine with Debug.WriteLine (#6618) 2019-01-11 14:24:10 -08:00
Justin Kotalik 2f6ff70dd4
Disable a set of flaky IIS tests (#6606) 2019-01-11 13:32:27 -08:00
Nate McMaster 5810af5ce7
Fix code-signing metadata for the SignalR java client (#6607) 2019-01-11 11:27:04 -08:00
Steve Sanderson 70cdf11f76
Make Razor Components apps not use Blazor build (#6562)
* Replace UseServerSideBlazor with UseRazorComponents, which doesn't require Blazor build artifacts

* Make UseRazorComponents serve blazor.server.js from embedded resource

... so we don't need a build step to put it on disk somewhere.

* Fix TestServer

* Update ComponentsApp not to use Blazor build targets

* Update ComponentsApp.App sample to use new build package

* Update string constant in test

* Rename blazor.*.js to components.*.js

* Ensure correct build order

* Update nav menu title in Components sample app

* Fix remaining paths

* Switch ComponentsApp.App to use Sdk="Microsoft.NET.Sdk.Razor"

* Update mono.cecil version

* CR: Replace FrameworkFilesProvider with EmbeddedFileProvider

* CR: Use ManifestEmbeddedFileProvider
2019-01-11 16:14:11 +00:00
Nate McMaster 3cd5054eb5
Merge branch 'release/2.2' 2019-01-11 07:20:00 -08:00
Rick Anderson 820304cfca Update src/Security/README.md (#6592) 2019-01-11 07:07:54 -08:00
Steve Sanderson 827ace6100
Factor WebAssembly debugging infrastructure out of Microsoft.AspNetCore.Components.Server (#6519)
* Add empty Blazor.Server project

* Move debugging middleware to Blazor.Server

* Use debugging middleware in Blazor standalone CLI

* Use debugging middleware in Blazor "hosted" sample

* Update artifacts.props
2019-01-11 10:29:43 +00:00
Javier Calvarro Nelson 5ff7e20c59
[Identity] Fix broken test (#6563) 2019-01-11 02:08:13 -08:00
BrennanConroy 364018238a
Refactor streaming from client to server (#4559) 2019-01-10 21:52:28 -08:00
Ben Adams 31c8423df1 Devirtualize HttpHeaders.Reset (#5950)
* Use Inlining to devirtualize
2019-01-10 20:34:41 -08:00
Ajay Bhargav Baaskaran 3b67abecbf
Add an MSBuild target to set MsBuild.exe path (#6401)
* Add an MSBuild target to set MsBuild.exe path

* Added a warning message

* Don't build Razor.Tasks twice

* Compile include inside the target
2019-01-10 17:34:25 -08:00
Mikael Mengistu 1677ed2073
Package Archive Baseline for the 2.1.8 Patch (#6578) 2019-01-10 15:54:13 -08:00
Ryan Nowak 14e606997f Fix #5116 Remove support for 2.0 precompilation
Obsoletes RazorViewAttribute and RazorPageAttribute and removes all of
our usage of them. I've already made the changes to have the SDK stop
generating these.
2019-01-10 15:38:10 -08:00
Pavel Krymets 5299eff616
Use hostfxr error callback support (#6043) 2019-01-10 14:07:47 -08:00
James Newton-King 90511e6039
Add HostPolicyMatcher (#6214) 2019-01-11 10:46:09 +13:00
Pranav K 55ec35bb80
Cleanup MvcJsonHelper (#6529)
* Cleanup MvcJsonHelper

* Remove dependency on JsonOutputFormatter
* Cache JsonSerializer for the default case
2019-01-10 12:34:27 -08:00
Pavel Krymets 26c78ee542
Create folders for debug log file (#6546) 2019-01-10 12:03:54 -08:00
Pranav K 5887e412c6 Rename Razor Components template
Fixes https://github.com/aspnet/AspNetCore/issues/6525
2019-01-10 10:43:29 -08:00
Pranav K be14ef19df Changes per PR comments 2019-01-10 10:25:07 -08:00
Pranav K 3bb22db516 Modify templates to reference Mvc.NewtonsoftJson 2019-01-10 10:25:07 -08:00
Dávid Kaya 36529e4a34 Removed extra curly bracket (#6558) (#6559) 2019-01-10 10:06:54 -08:00
David Fowler c458fe6ebe
Move request servies feature into DefaultHttpContext (#6541)
- This completely removes the per request allocation until the feature is used.
- In order to make this change viable, we need to introduce a new HttpContextFactory that can accept new services without adding 2^n constructors. As a result, this change introduces a DefaultHttpContextFactory that takes an IServiceProvider and resolves dependencies based on the needs of the DefaultHttpContext and features.
- Throw in the older HttpContextFactory constructor when the IServiceScopeFactory is null
- It also saves us from revving the feature collection version unnecessarily.
2019-01-10 09:54:09 -08:00
Pranav K 13841abd78 Remove Microsoft.AspNet.WebApi.Client and Newtonsoft.Json.Bson from shared fx 2019-01-10 09:34:00 -08:00
Nate McMaster 4c8db32b1c
Don't restore npmproj files in parallel (#6560)
NPM does not handle this well, so only run one NPM command at a time
2019-01-10 08:21:26 -08:00
Steve Sanderson 8446b260d9
Split .Components.Build into .Blazor.Build+.Components.Build (#6538)
* Move Components.Build to blazor/src/. No content changes yet.

* Rename Components.Build to Blazor.Build and update file paths

* Move Components.Build.Test files. No content changes yet.

* Update contents in Blazor.Test

* Fix names of props/targets files

* Add minimal Components.Build package that just imports Razor targets and analyzer

* Make Blazor.Build depend on Components.Build and get Razor compilation targets from there

* Fix version of reference from .Blazor.Build to .Components.Build

* Fix signing error on local builds

* Update artifacts.props
2019-01-10 11:23:36 +00:00
Nate McMaster 22f3166fa6
Merge branch 'release/2.1' into release/2.2 2019-01-10 01:22:10 -08:00
Ben Adams ad11f890ef Resolve input/output via IDuplexPipe interface once (#6371) 2019-01-09 21:25:22 -08:00
John Luo e5d943a7e3
Convert MvcPrecomp to Reference (#6472)
* Convert MvcPrecomp to use Reference and move to MVC
2019-01-09 18:48:01 -08:00
Nate McMaster 0f65d44482
Merge branch 'release/2.2' 2019-01-09 18:09:25 -08:00
Nate McMaster a6b04bf969
Fix MusicStore tests for 2.2 2019-01-09 17:18:01 -08:00
Pranav K 6b0c0761a4 Avoid doing selenium 2019-01-09 17:17:22 -08:00
Justin Kotalik a474a0567f
Merge branch 'release/2.2' 2019-01-09 16:42:12 -08:00
Hao Kung 17c6a64997
Add logging for OIDC/OAuth challenge (#6466) 2019-01-09 15:57:50 -08:00
Hao Kung d7a7c65b2b
Remove old 1.x auth stack (#4485)
* Remove old 1.x auth stack

Fixes https://github.com/aspnet/AspNetCore/issues/3999
2019-01-09 15:56:19 -08:00
Nate McMaster a3f9b74bb9
Merge branch 'release/2.1' into release/2.2 2019-01-09 14:52:53 -08:00
David Fowler ea344bf726
Don't allocate the FormFeature eagerly (#6511)
- Expose FormOptions on DefaultHttpContext
- Use those options on DefaultHttpContext when the FormFeature is initialized
2019-01-09 14:44:41 -08:00
Pavel Krymets b6bdffe247
Remove copy targets from ResolveIISReferences (#6539) 2019-01-09 14:05:41 -08:00
Pavel Krymets 422b3222d2
Add InstallLocation registry key support (#5705) 2019-01-09 13:47:00 -08:00
Nate McMaster d3838620d6
Convert SignalR projects to build with ProjectReference (#6457)
Part of #4246 

Changes:
* Update source code layout to follow the new conventions for this repo
* Update project files to use `<Reference>`
* Update targets to build NPM packages
* Update BuildTools to support custom 'restore' and 'test' targets
2019-01-09 13:12:35 -08:00
Pavel Krymets 89ef215146
Fix ServerTests test failure (#6530) 2019-01-09 12:03:45 -08:00
David Fowler a11c68ae35
Remove all extensibility from the DefaultHttpContext (#6504)
- Seal all of the classes
- Remove virtual methods
- Delete pooled HttpContext code
- Removed obsolete AuthenticationManager
2019-01-09 11:37:06 -08:00
Ryan Nowak 74f1ccad0d Temporarily disable E2E component tests
These are causing hangs and timeouts on macOS
2019-01-08 21:47:24 -08:00
Justin Kotalik 5541a7a026
Implement PipeBody Features and add to HttpContext (#6394) 2019-01-08 21:31:50 -08:00
Kahbazi e899823775 Add event name in Antiforgery (#6468) 2019-01-09 17:27:47 +13:00
Kahbazi 3c9cb4f3b5 Add event name in Middlewares (#6467) 2019-01-09 17:26:58 +13:00
David Fowler 688ad19170
Reuse HttpContext object per HTTP/1 connection and HTTP/2 stream (#6424)
- Today in Kestrel, we reuse the IFeatureCollection per connection and per Http2Stream. This PR aims to take advantage of that same technique and affinitize the HttpContext and friends so that they are only allocated per connection.
- ReusableHttpContext and friends mimic the functionality of DefaultHttpContext but is sealed and has no overridable methods.
- Introduce IHttpContextContainer which allows servers to cache the HttpContext and friends across requests.
2019-01-08 16:54:46 -08:00
Luke Latham b4c9ca12b4 Spelling typo in ANCM event log message (#6495) 2019-01-08 16:33:32 -08:00
James Newton-King dd39bd289a
Add event name in static files (#6456) 2019-01-09 13:19:25 +13:00
Kahbazi e106a8af08 Add log event name for CookiePolicy (#6454) 2019-01-09 12:10:20 +13:00
James Newton-King aadbed62de
Add event name in routing (#6455) 2019-01-09 12:01:14 +13:00
Bart Wolff 6a98c68628 Code cleanup response caching middleware (#6124)
* minor code cleanups

* comment public interface

* simplified some things using language features
2019-01-08 14:49:38 -08:00
Ryan Nowak 5a75084826 Update SDK and remove workaround 2019-01-08 13:20:16 -08:00
Pranav K cdc66c5f98 Move JSON.NET specific features to a separate assembly 2019-01-08 12:49:29 -08:00
David Fowler d116ab8550
Remove ObjectPoolProvider from default set of hosting services (#6437)
- Added it where it was being used
- Updated tests
2019-01-08 12:05:48 -08:00
Nate McMaster ce548479e1
Merge branch 'release/2.1' into release/2.2 2019-01-08 12:00:04 -08:00
Nate McMaster 5d16f97965
Remove netcoreapp2.0 test TFMs (#6461)
.NET Core 2.0 reached EOL last year. This removes multi-targeting our test projects and test assets to only use .NET Core 2.1 and .NET Framework 4.6.1.
2019-01-08 11:20:09 -08:00
Steve Sanderson 326e329018
Run components E2E tests in CI (#5158)
* Auto-install local copy of selenium-standalone on build

* Automatically start/stop selenium-standalone when running E2E tests

* Update after rebase

* Exclude node_modules from E2ETests project

* Avoid deadlocks

* Include E2E tests when running all tests in src/Components

* Be more forgiving about waiting for selenium-server to be ready

* Update usage of shared source file
2019-01-08 16:07:07 +00:00
Pavel Krymets c60d1e1a14
Handle EOF HResult from async callback (#6453) 2019-01-07 15:04:28 -08:00
dotnet-bot c06eec1e8f Merge in 'release/2.2' changes 2019-01-07 21:31:03 +00:00
Justin Kotalik 33d42551ac Fix MusicStore PackageReferences and cleanup README 2019-01-07 12:53:08 -08:00
Kahbazi f2e6e6ff33 Add log event name for security projects (#6420) 2019-01-08 09:11:09 +13:00
Justin Kotalik 2e67864995 Merge branch 'release/2.1' into release/2.2 2019-01-07 10:27:41 -08:00
Pavel Krymets 6699fd056e
Add FilesToSign to all .cpp projects (#6443) 2019-01-07 10:05:12 -08:00
dotnet-bot 973b4b2fbf Merge in 'release/2.1' changes 2019-01-07 17:35:10 +00:00
Justin Kotalik 375e9d2cbd
Make music store project ref (#6313) 2019-01-07 09:34:05 -08:00
Luke Latham 75cea9a04c Add migrations to DP EntityFrameworkCoreSample (#6038)
Per discussion: https://github.com/aspnet/Docs/issues/9864
2019-01-07 08:50:35 -08:00
Nate McMaster dc206b747e
Ensure shared framework metadata files are generated on build (#6407) 2019-01-07 07:38:24 -08:00
Steve Sanderson 7cd7820274 Remove blazor template content projects from .sln. Can still run directly from commandline. 2019-01-07 10:17:41 +00:00
Martin Costello ca7c48c520 Fix ArgumentException from duplicate key (#6416) 2019-01-07 13:42:36 +13:00
James Newton-King 489735d390
Use test timeout logic from Microsoft.AspNetCore.Testing (#6433) 2019-01-07 13:39:59 +13:00
Nate McMaster edfb2ab8ab
Merge branch 'release/2.2' 2019-01-05 00:34:13 -08:00
Hao Kung 9e0c93b64b Update UserManager docs for spelling/clarity (#5952)
Port of https://github.com/aspnet/Identity/pull/1003
2019-01-04 17:32:26 -08:00
dotnet-bot 48a74801d3 Merge in 'release/2.2' changes 2019-01-05 00:26:34 +00:00
Pavel Krymets 47e8d56853
Use ProjectReference.TargetPath in installers (#6391) 2019-01-04 16:01:49 -08:00
Nate McMaster 0926b93b98
Ensure Identity.Views.{V3, V4}.dll are the AllItemsFullPathWithTargetPath group so they get copied across ProjectReferences 2019-01-04 14:20:13 -08:00
dotnet-bot 590fe38284 Merge in 'release/2.2' changes 2019-01-04 22:20:08 +00:00
Nate McMaster 9556cc133d
Merge branch 'release/2.1' into release/2.2 2019-01-04 14:17:28 -08:00
Ryan Nowak 9003c3cd75 PR Feedback
From:
2cb3964411..45adea0c6d (diff-9328b73f3a66921c3ef3fa8a4ce90031)
2019-01-04 13:38:32 -08:00
James Newton-King 98cce23c67
Add routing information to DeveloperExceptionPage (#6320) 2019-01-05 09:28:24 +13:00
Ajay Bhargav Baaskaran 50996e3da1
Add missed reference to Razor SDK in Mvc test website (#6367) 2019-01-04 11:22:25 -08:00
dotnet-bot da77274259 Merge in 'release/2.1' changes 2019-01-04 18:01:45 +00:00
Nate McMaster 436076fd55
Fix broken tests and VS solutions caused by source code reorganization and other build infra cleanup
Changes:
* Fix broken tests and VS solutions caused by source code reorganization
* Add a check to validate generated code and solutions on PRs
* backport some source code reorg to src/Identity
* Fix startvs.cmd if you've already run build.ps1
* Add PR checks for tests on Linux/macOS
* Skip broken Nginx tests
* Add conditions to skip IIS tests on non-Windows platforms
2019-01-04 10:00:26 -08:00
Doug Bunting d689eede36 Revert "Work around `CryptographicException`s thrown in some full framework test runs"
- no longer support .NET Framework

This reverts commit 192e8073ee
2019-01-04 09:56:06 -08:00
Doug Bunting 69b5ab9c01 React to JwtBearer removal from Microsoft.AspNetCore.App
nits:
- remove NET461 special case
- remove reference to transitive Mvc.Core dependency
2019-01-04 09:56:06 -08:00
Pavel Krymets 143a727113
Remove AspNetCoreModule virtual projects (#6317) 2019-01-04 09:40:40 -08:00
David Fowler c61639b4a4
Reduce HTTP/2 allocations (#6119)
- Remove per request allocations on the thread pool by implementing IThreadPoolWorkItem on Http2Stream
- Made generic version of Http2Stream to store the IHttpApplication instead of using a tuple
- Removed passing of IHttpApplication<TContext> everywhere
2019-01-04 08:33:57 -08:00
James Newton-King 51047ef9d6
Update solutions to use correct IIS project location (#6344) 2019-01-04 15:28:59 +13:00
Stephen Halter 6a5c0cf189
Manually time out H2SpecTests (#6366) 2019-01-03 16:31:53 -08:00
Doug Bunting 236ceb73c1 Remove Mvc.NoFun.sln 2019-01-03 16:13:34 -08:00
Justin Kotalik 3c04338891
Move PipeAdapters to System.IO.Pipelines namespace. (#6325) 2019-01-03 15:58:59 -08:00
Chris R 8b2be38b6b Merge branch 'JwtBearerOptionsSummary' 2019-01-03 15:25:22 -08:00
Stephen Halter b1f778bfb8
[Kestrel] Allow HTTP/2 stream drain timeout during trailers (#4070)
- Move all HTTP/2 stream state management into request parsing loop
2019-01-03 15:03:00 -08:00
Nate McMaster bfec2c14be
Merge branch 'release/2.2' 2019-01-03 12:18:01 -08:00
Doug Bunting be7dfa30af
Use InputFormatterException for another case (#6316)
- #4917

nits:
- test `ExceptionPolicy` logic in an input formatter
- remove old Mono workarounds in `SerializaterErrorTests`
- fix typo in `SerializableErrorTests` (not using theory data)
2019-01-03 11:02:07 -08:00
Doug Bunting c2df506894 Correct path to IIS Integration project
- react to 37291ea114
2019-01-03 10:51:47 -08:00
Justin Kotalik 910e5ad7e5
Reference InprocessTestSite in CreateDefaultBuilderApp and Disable Failing Tests (#6318) 2019-01-03 08:54:14 -08:00
N. Taylor Mullen afb92018f0 Produce log output for flakey test.
- For the flakey test replaced the default logger with Xunit's `ITestOutputHelper` in order to see what's going wrong when the flakey test will eventually fail.

aspnet/AspNetCore-Internal#1337
2019-01-02 20:48:38 -08:00
dotnet-bot 291b346201 Merge in 'release/2.2' changes 2019-01-03 00:55:40 +00:00
Pavel Krymets 0ae6cc8e88
Remove InplaceStringBuilder usages (#6163) 2019-01-02 15:50:19 -08:00
Justin Kotalik 3477daf3c4 Merge branch 'master' of https://github.com/aspnet/aspnetcore 2019-01-02 14:55:36 -08:00
Nate McMaster 65ff6e951a
Merge branch release/2.1 into release/2.2 2019-01-02 14:34:45 -08:00
dotnet-bot 90b2d60332 Merge in 'release/2.1' changes 2019-01-02 22:31:05 +00:00
Ajay Bhargav Baaskaran a10aff3a03
Specify correct global.json path for Razor.Design tests (#6311) 2019-01-02 14:30:01 -08:00
Pranav K 94dd5eff21 Fix incorrect Debug.Assert statements 2019-01-02 14:13:46 -08:00
Justin Kotalik 2d48eeb479 Feedback 2019-01-02 14:04:42 -08:00
Mazioudi Anas 5665d78ffe Correct documentation wording (#6220) 2019-01-02 13:41:44 -08:00
Hamza Assyad 6469851a12 Adding Amazon Cognito to the list of supported Identity providers (#6039) 2019-01-02 13:39:46 -08:00
Justin Kotalik 474f115c1f Merge remote-tracking branch 'origin/master' into merge/release/2.2-to-master 2019-01-02 12:57:48 -08:00
Justin Kotalik 68067b8aca Keep Platform targets 2019-01-02 11:50:36 -08:00
dotnet-bot df29851149 Merge in 'release/2.2' changes 2019-01-02 19:20:51 +00:00
Pranav K 199e3f14a2 Look at ApiConventionType attributes defined on base types
Fixes https://github.com/aspnet/AspNetCore/issues/4951
2019-01-02 10:36:47 -08:00
Nate McMaster 7e38b563bd
Merge branch 'release/2.1' to release/2.2 2019-01-02 10:29:38 -08:00
Doug Bunting f182b1adac Add sufficient projects to Mvc.NoFun.sln for it to build in VS
nit: ignore .vscode/ directories
2019-01-02 10:24:10 -08:00
Justin Kotalik 9ab501e3b1 Remove file that should be ignored 2019-01-02 10:21:19 -08:00
Justin Kotalik 6efb449c26 Merge release/2.2 into master 2019-01-02 10:17:34 -08:00
dotnet-bot e3f86f3631 Merge in 'release/2.2' changes 2019-01-02 17:58:35 +00:00