Commit Graph

37325 Commits

Author SHA1 Message Date
Nate McMaster 416d8cd1ea
Merge branch 'release/2.2' 2018-11-08 08:48:35 -08:00
Nate McMaster 3918724616
Merge branch 'release/2.1' into release/2.2 2018-11-08 08:31:22 -08:00
ASP.NET CI 03c287406e Updating submodule(s)
EntityFrameworkCore => 68a631e43b262c1ad3039cd36728b49bed128cdd

[auto-updated: submodules]
2018-11-08 08:15:16 -08:00
ASP.NET CI 120dc05eb6 Updating submodule(s)
EntityFrameworkCore => 79bf0063bec879ba7f859e5fafbdf9a82b542a91
KestrelHttpServer => a1c1083798
Razor => 913217f61a
SignalR => f4d3ebe09a

[auto-updated: submodules]
2018-11-08 00:04:37 -08:00
Ajay Bhargav Baaskaran eed23bd778
Merge pull request #2715 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-11-07 19:02:57 -08:00
James Newton-King 1d3521113a
Change namespace to Microsoft.AspNetCore.Http.Endpoints (#1061) 2018-11-08 15:52:01 +13:00
James Newton-King cb83e4f485
Authorization middleware (#1894) 2018-11-08 15:42:35 +13:00
Ajay Bhargav Baaskaran 913217f61a
Merge pull request #2713 from dotnet-maestro-bot/merge/release/2.1-to-release/2.2
[automated] Merge branch 'release/2.1' => 'release/2.2'
2018-11-07 18:20:47 -08:00
Nate McMaster e0bdbb59f7
Reorganize source code in src/DataProtection
* Pair implementations and unit tests side by side in src/ and test/ folders
* Update .sln and project paths
* Rename unit test projects from Test.csproj => Tests.csproj
* Update KoreBuild properties to allow building projects, not solutions
2018-11-07 17:33:30 -08:00
Stephen Halter c20884045d Merge branch 'release/2.2' 2018-11-07 17:13:40 -08:00
Stephen Halter a1c1083798
[2.2] Fix race conditions in HTTP/2 tests (#3078) 2018-11-07 17:09:44 -08:00
Stephen Halter b3d72773b1
Fix race conditions in HTTP/2 tests (#3024) 2018-11-07 17:09:21 -08:00
Stephen Halter f6d589a6c4
Remove invalid Debug.Assert in Http2Connection (#3080)
The _streams dictionary may not contain the completing stream in
OnStreamCompleted since the IsDraining flag is applied beforehand
which allows it to be removed by the request processing thread.
2018-11-07 17:08:44 -08:00
Andrew Stanton-Nurse ead32f295f Merge branch 'release/2.2' 2018-11-07 15:29:08 -08:00
dotnet-maestro-bot c206ea612a [automated] Merge branch 'release/2.2' => 'master' (#3278)
I detected changes in the release/2.2 branch which have not been merged yet to master. I'm a robot and am configured to help you automatically keep master up to date, so I've opened this PR.

This PR merges commits made on release/2.2 by the following committers:

* @anurse

## Instructions for merging

This PR will not be auto-merged. When pull request checks pass, please complete this PR by creating a merge commit, *not* a squash or rebase commit.

<img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" />

You can also do this on command line:

```
git checkout -b merge/release/2.2-to-master master
git pull https://github.com/dotnet-maestro-bot/SignalR merge/release/2.2-to-master
git checkout master
git merge --no-ff merge/release/2.2-to-master
git push origin master
```

## Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli].

[resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/
[resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/

## Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/2.2-to-master'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

```
git checkout -b merge/release/2.2-to-master master
git pull https://github.com/dotnet-maestro-bot/SignalR merge/release/2.2-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/SignalR merge/release/2.2-to-master
```

Please contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.
2018-11-07 15:27:19 -08:00
Nate McMaster 975011071b
Bump version to 2.1.7 2018-11-07 14:51:28 -08:00
Ajay Bhargav Baaskaran 9749c90fc7
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2 2018-11-07 14:50:27 -08:00
Nate McMaster 3f26b56fef
Bump version to 2.1.7 2018-11-07 14:33:47 -08:00
Nate McMaster b75fa54ad2
Remove the EntityFrameworkCore submodule (#3964)
This removes EntityFrameworkCore as a git submodule. The EFCore repo will build on its own, and the AspNetCore repo will consume EFCore via PackageReference.
2018-11-07 14:00:19 -08:00
Justin Kotalik 263fb650be
Detect shared configuration in ANCM installers and fail if enabled (#3962) 2018-11-07 13:19:27 -08:00
Pranav K d632469909 React to Razor.Design package removal 2018-11-07 13:16:16 -08:00
Andrew Stanton-Nurse f4d3ebe09a
Add docs blurb to Readme (#3276) 2018-11-07 12:10:48 -08:00
ASP.NET CI 9ff91eb615 Updating submodule(s)
SignalR => a03b8f85a8

[auto-updated: submodules]
2018-11-07 12:03:39 -08:00
ASP.NET CI ada9f000a2 Updating submodule(s)
SignalR => 755264e335

[auto-updated: submodules]
2018-11-07 12:03:06 -08:00
BrennanConroy 755264e335 Merge branch 'release/2.2' 2018-11-07 08:52:13 -08:00
BrennanConroy a03b8f85a8
Add docker retry to stackexchange redis tests (#3270) 2018-11-07 08:48:49 -08:00
ASP.NET CI f695af0099 Updating submodule(s)
EntityFrameworkCore => f54a7241e78c9d9c8d87e80ec7cd68a1526767da
HttpAbstractions => 066c5ce337
MusicStore => 2b0ea782be
Session => a4af62e774

[auto-updated: submodules]
2018-11-07 07:32:26 -08:00
Nate McMaster a4af62e774
Upgrade target framework to netcoreapp3.0, upgrade dependencies, and remove dependency on deprecated Redis package 2018-11-07 07:28:11 -08:00
Steve Sanderson 5a836ef0a6 Update to ws-proxy code matching Mono repo 5e318afd 2018-11-07 12:01:50 +00:00
Steve Sanderson edff13f25a Add new System.Buffers.dll BCL assembly to SignToolData.json exclusion list 2018-11-07 12:01:50 +00:00
Steve Sanderson 080399da3d Update MonoPlatform startup code to match newer Mono 2018-11-07 12:01:50 +00:00
Steve Sanderson 0857483a42 Use prebuilt Mono binaries. Remove asm.js fallback (Mono doesn't distribute asm.js builds). 2018-11-07 12:01:50 +00:00
Steve Sanderson 54f78ca34d Fix build when repo path contains space. Fixes #1541 2018-11-07 11:54:24 +00:00
Justin Kotalik 2b0ea782be
Disable IISExpress tests (#877) 2018-11-06 23:42:47 -08:00
Nate McMaster 0e3260f2b4
Merge branch 'release/2.2' 2018-11-06 21:47:30 -08:00
Nate McMaster 302d8d59dd
Remove the aspnet/Caching submodule 2018-11-06 21:20:06 -08:00
ASP.NET CI 5faea3ff7b Updating submodule(s)
MvcPrecompilation => 032768b063
SignalR => 56f78b4593

[auto-updated: submodules]
2018-11-06 18:16:25 -08:00
Nate McMaster 3cb67766a8
Merge branch 'release/2.2' 2018-11-06 18:09:01 -08:00
Nate McMaster d81128de11
Fix CodeSign.props to include the .dll in the file name for logging files 2018-11-06 18:07:54 -08:00
Nate McMaster 011cf21a5c
Merge branch 'release/2.2' 2018-11-06 17:42:44 -08:00
Nate McMaster 17ee447d26
Upgrade to Extensions 2.2.0-rtm-181106-10 2018-11-06 17:32:06 -08:00
Nate McMaster 3cf8a41e4a
Remove the aspnet/Logging submodule 2018-11-06 17:30:26 -08:00
ASP.NET CI a3902573a5 Updating submodule(s)
Razor => fd4572874e

[auto-updated: submodules]
2018-11-06 17:12:19 -08:00
James Newton-King 066c5ce337
Implicitly execute matched endpoint at the end of middleware pipeline (#1059) 2018-11-07 12:57:31 +13:00
Pranav K 032768b063
Merge pull request #301 from aspnet/prkrishn/merge/2.2
Prkrishn/merge/2.2
2018-11-06 15:38:58 -08:00
James Newton-King d77b370fb1
Add Endpoint extension methods to HttpContext (#1060) 2018-11-07 12:24:15 +13:00
BrennanConroy 56f78b4593
Retry redis docker (#3265) 2018-11-06 15:23:03 -08:00
ASP.NET CI 2d46064467 Updating submodule(s)
MvcPrecompilation => 617586a984

[auto-updated: submodules]
2018-11-06 15:15:25 -08:00
Pranav K 174e53d45c
Merge remote-tracking branch 'origin/release/2.1' into release/2.2
# Conflicts:
#	test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs
#	test/FunctionalTests/CoreCLRTests/ApplicationWithTagHelpersTest_CoreCLR.cs
#	test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs
#	test/FunctionalTests/DesktopTests/ApplicationWithTagHelpersTest_Desktop.cs
#	test/FunctionalTests/DesktopTests/SimpleAppTestWithPlatformx86_Desktop.cs
2018-11-06 15:14:43 -08:00
Pavel Krymets 8027397d67 Merge branch 'merge/release/2.2-to-master' 2018-11-06 15:12:04 -08:00