Commit Graph

8193 Commits

Author SHA1 Message Date
Nate McMaster 10c4646146
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in bf9fd0d106
2018-11-13 11:24:22 -08:00
Nate McMaster 9671b9d8c3
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 3b485909eb
2018-11-13 11:21:52 -08:00
Nate McMaster ccd098ecad
Update DataProtection to use custom reference resolution
This changes DataProtection to build as projects instead of a pseudo-submodule. It replaces Package and ProjectReference with <Reference> items which custom targets then resolve.
2018-11-13 10:28:42 -08:00
Pavel Krymets 160d822f52
Do not fallback to creating console logger (#1789) 2018-11-13 09:48:28 -08:00
Nate McMaster bb6901141c
Remove the HtmlAbstractions git submodule and merge Html.Abstractions into this repo 2018-11-13 09:29:27 -08:00
Justin Kotalik de9609b343
Remove implicit reference to InteralAspNetCoreSdk (#3998) 2018-11-12 09:05:17 -08:00
Gert Driesen bd481034fe Improve performance and reduce allocations in RouteParameterParser. (#901) 2018-11-11 17:08:29 +13:00
James Newton-King f6b1138ce3
Fix RouteValueAddressScheme to require metadata to match (#910) 2018-11-10 13:41:44 +13:00
Nate McMaster 1ab08d70ef
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 252ae0c434
2018-11-09 16:17:15 -08:00
Henk Mollema e790a9bb10 Inject ICorsPolicyProvider instance through Invoke
This allows for scoped instances of `ICorsPolicyProvider` to be injected in the CORS middleware and prevents turning them into singletons.

Resolves #105
2018-11-09 14:40:51 -08:00
Nate McMaster 0a44f1c068
Merge branch 'release/2.1' into namc/mondo 2018-11-09 13:11:09 -08:00
Nate McMaster fd6b46bc7f
Merge the source code of aspnet/JsonPatch into this repo 2018-11-09 13:07:24 -08:00
Nate McMaster 27a47d07c5
Reorganize the src/WebSockets/ folder to follow new source code organization conventions 2018-11-09 13:06:13 -08:00
Nate McMaster 59ed8df382
Add targets and tools for ensuring consistent package versions between servicing builds 2018-11-09 13:05:31 -08:00
Nate McMaster 74d9728e95
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 218064c300
2018-11-09 12:49:58 -08:00
Stephen Halter 119a7695aa Merge branch 'release/2.2' 2018-11-09 12:46:07 -08:00
Stephen Halter 5db6394769
Always decrement count on HTTP/2 stream completion (#3087)
#3079
2018-11-09 12:40:51 -08:00
Justin Kotalik 4b4bd68fc7
Downgrade stable package versions and remove duplicate test project (#3991) 2018-11-09 11:27:08 -08:00
Justin Kotalik 8356baf7a6
Port ANCM installer changes to 2.1 (#3874) 2018-11-09 11:10:33 -08:00
Nate McMaster bd5bf34351
Merge branch 'release/2.2' 2018-11-09 07:29:37 -08:00
Nate McMaster db0d3c333d
Fix NU1605 build error by ensuring package versions are set correctly in subfolder projects (#3987) 2018-11-08 23:40:14 -08:00
Nate McMaster bc44d9d4e0
Remove artifact info for StressTestWebSite.zip 2018-11-08 17:50:34 -08:00
Nate McMaster 0c6e4bebab
Prepare to build the 2.1.7 patch (#3970)
* Prepare 2.1.7 patch
* Add documentation for how we prepare servicing updates
2018-11-08 17:07:18 -08:00
Nate McMaster ba70991d7c
Stop publishing runtime-extension-internal.zip and don't produce StressTestWebsite.zip by default in CI builds (#3984) 2018-11-08 17:01:31 -08:00
Nate McMaster 7f4d10775c
Add signcheck exclusions (#3985) 2018-11-08 16:57:07 -08:00
Stephen Halter 9053772cd0 Merge branch 'release/2.2' 2018-11-08 15:17:48 -08:00
Stephen Halter 2b87e7be85 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-08 15:16:27 -08:00
Stephen Halter 50bb0b3bc9
Implement no-op HTTP/2 IHttpUpgradeFeature (#3082) 2018-11-08 15:10:07 -08:00
Alexander Shabunevich bf9fd0d106 Prevent null refs when copying a property with a null value
* Fix aspnet/AspNetCore#3559 Json Patch: System.NullReferenceException while trying to use copy operation from property with null value.

* Fix aspnet/AspNetCore#3559: Missing tests added.
2018-11-08 14:29:34 -08:00
Pavel Krymets 89a3526769
Move runtime site extension to installers (#3954) 2018-11-08 14:13:07 -08:00
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
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
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 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
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
Nate McMaster 011cf21a5c
Merge branch 'release/2.2' 2018-11-06 17:42:44 -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
James Newton-King d77b370fb1
Add Endpoint extension methods to HttpContext (#1060) 2018-11-07 12:24:15 +13:00
Pavel Krymets f024e779a6 Merge branch 'merge/release/2.2-to-master' of https://github.com/dotnet-maestro-bot/JavaScriptServices into merge/release/2.2-to-master 2018-11-06 15:11:14 -08:00
Pavel Krymets 9d570d791f
Remove obsolete logging API usage (#3953) 2018-11-06 14:50:35 -08:00
Pavel Krymets 7819c2f950
Remove obsolete API usage (#1784) 2018-11-06 14:10:24 -08:00
John Luo 5488932e31 Merge branch 'release/2.2' 2018-11-06 14:04:45 -08:00
John Luo 7ef549416f Add prerelease label to deb installer package version 2018-11-06 14:02:48 -08:00
Justin Kotalik a00118ada1
Disable IIS tests due to web.config generation issue (#3951) 2018-11-06 13:25:50 -08:00
Nate McMaster df46dfee73
Merge branch 'release/2.2' 2018-11-06 12:13:05 -08:00
Nate McMaster 7f95d6af34
Remove everything from the package archive except Microsoft.AspNetCore.App 2018-11-06 09:43:51 -08:00
Nate McMaster 4f887e5cd4
Merge branch 'release/2.1' into release/2.2 2018-11-06 09:23:17 -08:00
Nate McMaster 17cccade43
Add IsFinalBuild switch to Windows installer script (#3892) 2018-11-06 09:06:10 -08:00
Liam Dawson 9de04520e0 Add `user-secret init` command for adding a UserSecretsId to a project file (#500) 2018-11-05 10:44:50 -08:00
Justin Kotalik c5e7bd244d Merge branch 'release/2.2' 2018-11-05 09:10:29 -08:00
Justin Kotalik 90b11de8f1
Get IISIntegration CI working (#3875) 2018-11-05 08:45:11 -08:00
John Luo e8fec8eb52
Enable symbols generation for crossgen'ed assemblies on linux-arm (#3877) 2018-11-02 18:06:04 -07:00
John Luo faba76cfa1 Merge branch 'release/2.2' 2018-11-02 15:57:49 -07:00
John Luo d36a480253 Build and crossgen linux-arm shared framework in Docker container 2018-11-02 15:14:19 -07:00
Justin Kotalik dcece2090c
Remove IISIntegration submodule, add CI (#3867) 2018-11-02 14:34:31 -07:00
Nate McMaster 0e24161d42
Ensure Microsoft.AspNetCore.Server.IntegrationTesting.IIS doesn't produce a finalized version 2018-11-02 11:07:45 -07:00
John Luo 3327267396 Merge branch 'release/2.2' 2018-11-02 11:03:05 -07:00
Stephen Halter f2a383dc76
Don't count long tick intervals against rate measurements (#3070)
This might help address #3015

This only affects rate timeouts. Normal fixed timeouts might deserve the same treatment, but that would require some additional locking to ensure we don't modify the sentinel value.
2018-11-02 10:58:30 -07:00
Nate McMaster 50e1e60247
Merge branch 'release/2.2' 2018-11-02 10:49:11 -07:00
Justin Kotalik afab1a5be6
Remove IISIntegration submodule, add CI [2.2] (#3865) 2018-11-02 10:22:04 -07:00
Nate McMaster b7850f9865
Remove Microsoft.AspNetCore.Razor.Design from Microsoft.AspNetCore.App 2018-11-02 10:14:05 -07:00
Nate McMaster cb85ffa8f6
Merge branch 'release/2.2' 2018-11-02 10:10:49 -07:00
Mike Lorbetske 2af66e4eba
Merge pull request #510 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-11-02 09:42:33 -07:00
Nate McMaster 303ee1ff56
Fix the filename for the debian installer 2018-11-01 22:50:58 -07:00
Nate McMaster 27deb6f6f8
Remove dependency on Docker from MSBuild targets (#3866)
Changes:
* This removes MSBuild targets which invoke `docker` commands to build
   deb and rpm installers
* Remove installer targets from the KoreBuild context. Put them into
   separate project files
* Simplify the targets used to build installers by reducing duplicate
   variable names and deeply nested MSBuild contexts
* Remove unused dependencies from the Docker build context
2018-11-01 15:02:29 -07:00
Mike Lorbetske d745b8c161 Fix #485 2018-11-01 13:00:20 -07:00
Mike Lorbetske 22a32500ac Fix several issues
Fix #502

Fix #492

Fix #491

Fix #486

Improves #489
2018-11-01 13:00:20 -07:00
Justin Kotalik 83fe4c089b
Remove M.A.Server.IIS package from 2.1. Fix signing issues (#3859) 2018-11-01 11:30:31 -07:00
Justin Kotalik 868dc32c97 Merge branch 'release/2.2' 2018-10-31 21:04:25 -07:00
Justin Kotalik d6a5ef57af Merge remote-tracking branch 'i/jkotalik/30Merge' into jkotalik/new30Merge 2018-10-31 20:05:44 -07:00
Justin Kotalik 69b7b427fc
Merge pull request #3781 from aspnet/jkotalik/21Merge 2018-10-31 19:40:28 -07:00
Justin Kotalik 3f04c928f4 Merge branch 'jkotalik/21Merge' into jkotalik/22Merge 2018-10-31 18:38:00 -07:00
Justin Kotalik fc17530148 Merge remote-tracking branch 'i/jkotalik/22Merge' into jkotalik/22Merge 2018-10-31 18:25:22 -07:00
Justin Kotalik ce68c8e5be remove submodule 2018-10-31 18:14:34 -07:00
Justin Kotalik 04d1f6813c Merge remote-tracking branch 'i/jkotalik/21Merge' into jkotalik/21Merge 2018-10-31 17:18:48 -07:00
Justin Kotalik ebb0bfefb7 Reorganize source code in preparation to move into aspnet/aspnetcore 2018-10-31 16:57:49 -07:00
Stephen Halter 153ff670a1 Merge branch 'release/2.2' 2018-10-31 16:51:55 -07:00
Justin Kotalik 7fbedc602c Move 22 into subfolder 2018-10-31 16:40:21 -07:00
Justin Kotalik 55e809c5dc Move more files 2018-10-31 16:38:30 -07:00
Justin Kotalik 040fb6f18a Move IISIntegration into subfolder 2018-10-31 15:51:17 -07:00
Stephen Halter d50c0c13b9
Measure the rate of all HTTP/2 output (#3067)
Prior to this, only the response body counted toward the HTTP/2 response data rate. This PR aligns the HTTP/2 logic closer to the HTTP/1.x logic and measures the rate for all HTTP/2 response data.

This PR also accounts for all response bytes written, not just those that immediately induced backpressure.
2018-10-31 15:34:17 -07:00
Pranav K e27088d9d9 React to Razor.Design package removal 2018-10-31 14:26:52 -07:00
Ryan Nowak 891ae28851 Merge branch 'release/2.2' 2018-10-31 14:24:26 -07:00
Ryan Nowak 3b485909eb Fix aspnet/AspNetCore#3634 2018-10-31 14:12:55 -07:00
Ryan Nowak c9a53b9067
Merge pull request #522 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-31 13:26:02 -07:00
Ryan Nowak c802d5ef5f
Redesign HealthStatus (again) (#520)
* Redesign HealthStatus (again)

This change brings back the ability to return Healthy/Degraded/Unhealthy
in a HealthCheckResult. We tried making this pass/fail in 2.2.0-preview3
and folks writing health checks for their own use pointed out (rightly
so) that it was too limited.

It's still possible for the app developer to configure the failure
status of a health check, but it requires the health check author to
cooperate.

I also got rid of HealthStatus.Failed since it raises more questions
than it answers. It's really not clear that it's valuable for a health
check for behave different when throwing an unhandled exception.

We would still recommend that a health check library handle exceptions
that they know about and return `context.Registration.FailureStatus`.
2018-10-31 12:51:14 -07:00
Nate McMaster ba87c3fbd1
Remove Microsoft.AspNetCore.All (#3761)
This shared framework and metapackage are obsolete. The recommended replacement is Microsoft.AspNetCore.App.
2018-10-31 12:13:05 -07:00
Filip W 187e89f6f0 Do not throw a null reference from request.GetDisplayUrl() (#1057) 2018-10-30 12:32:26 -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
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
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
Ryan Nowak 08699702ad
Merge pull request #518 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-27 21:57:41 -07:00
Ryan Nowak 1afd5b2594 Don't use Map
Fixes aspnet/Diagnostics#511 and aspnet/Diagnostics#514

It's really confusing to people that we use Map. Users expect that the
URL they provide for the health check middleware will only process
exact matches. The way it behaves when using map is not optimal for some
of the common patterns.
2018-10-27 21:01:55 -07:00
Nate McMaster eba014d534
Add additional signing configuration for external assemblies in the tools packages 2018-10-27 02:06:55 -07:00
Nate McMaster 3c0f4ef14f
Merge branch 'release/2.2' 2018-10-27 01:31:58 -07:00
Nate McMaster c8b1d2cfe5
Merge branch 'release/2.1' into release/2.2 2018-10-27 01:31:12 -07:00
Nate McMaster d957ac9da0
Remove Microsoft.DotNet.GlobalTools.Sdk, upgrade BuildTools, and change VSIX signing cert name 2018-10-27 01:28:14 -07:00
Nate McMaster d2af13517b
Merge branch 'release/2.2' 2018-10-26 13:39:01 -07:00
Nate McMaster 6bafc157e7
Update code signing config to exclude .js and .ttf files in template packages 2018-10-26 11:51:23 -07:00
Ryan Brandenburg 2adf798ba0 Fix peer dependencies in React templates 2018-10-26 11:46:48 -07:00
Pranav K a74235c7ec Reflect Access-Control-Request-Headers and Access-Control-Request-Method when policy is configured to support wildcard
Fixes https://github.com/aspnet/AspNetCore/issues/3684
2018-10-26 11:11:33 -07:00
Stephen Halter b2c65bd346 Merge branch 'release/2.2' 2018-10-26 11:01:02 -07:00
Stephen Halter 395b681348
Add HTTP/2 request body data rate limit (#3051) 2018-10-26 10:46:46 -07:00
Nate McMaster ee11d10f04
Remove BrowserLink and Scaffolding gitsubmodules (#3730)
As a part of simplifying the way we build ASP.NET Core, the BrowserLink and Scaffolding repos and the packages they produce will be independent from aspnet/AspNetCore.
2018-10-26 10:17:57 -07:00
Pavel Krymets 99f2ecd02f
Move transformation tests from AzureIntegration (#3726) 2018-10-26 09:49:19 -07:00
Hao Kung ec176b2e40
Merge release/2.2 (#1055)
* Add safe copy for enumeration (#1052)
2018-10-25 18:43:21 -07:00
Ryan Brandenburg 89d493bac8
Merge pull request #805 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-25 16:23:28 -07:00
Ryan Brandenburg 958e0b1d9f Get rid of Page1 Page2 2018-10-25 15:12:31 -07:00
Nate McMaster ae122d9bc0
Include rid-specific runtime packages in the list of artifacts 2018-10-25 14:42:00 -07:00
Nate McMaster 77a3089c8d
Workaround quirks in NuGet
* Disable package analysis because it incorrectly issues NU5109 on macOS, but not windows
* Normalize file paths because if you mix slashes, NuGet will just skip the entire folder
* Normalize the project path given to restore. If it not normalized, restore skips the project and issues a warning
2018-10-25 14:27:46 -07:00
Ryan Brandenburg b05185f1f1
ESLint (#796)
Include ESLint in react templates
2018-10-25 12:27:39 -07:00
Ryan Brandenburg 9b3d1f56fd
Handle peer dependency warnings (#794)
Handle peer dependency warnings
2018-10-25 12:00:49 -07:00
Nate McMaster 9d878dddf1
Merge branch 'release/2.2' 2018-10-25 11:12:59 -07:00
Nate McMaster 8c20892290
2.2: Remove BrowserLink from templates (#801)
This removes support for the `--use-browserlink` flag from the templates. The Microsoft.VisualStudio.Web.BrowserLink package will still ship in 2.2, but users who want this should use `dotnet add package Microsoft.VisualStudio.Web.BrowserLink` instead.
2018-10-25 10:49:44 -07:00
Pavel Krymets 044f613804
Include failed HRESULTs and exceptions in FREB log (#1548) 2018-10-25 08:48:21 -07:00
Justin Kotalik de185b6a06
Duplicate debug log handle for console logging (#1558) 2018-10-25 08:47:31 -07:00
Nate McMaster 11d0b328ba
Remove VS.Web.CodeGeneration packages from the fallback folder cache (#3717) 2018-10-24 21:05:44 -07:00
Nate McMaster 654debe8fb
Merge branch 'master' into merge/release/2.2-to-master 2018-10-24 17:51:56 -07:00
Nate McMaster 7bde7399e9
2.2: remove Microsoft.VisualStudio.Web.CodeGeneration.Design from templates (#802)
This package does not need to be in the project until someone uses Visual Studio code generation. Visual Studio will automatically add this package when scaffolding is used for the first time, so it's unnecessary to put this in our templates.
2018-10-24 17:42:02 -07:00
Nate McMaster 968df9578b
Refactor shared framework projects targets and project layout (#3703)
This refactors the targets used to build the shared framework and its .zip files. There are lots of reasons motivating this: Arcade convergence, migration to VSTS, making it easier to build this locally, etc.

Changes:
* Moves move content of build/Sharedfx.{props/targets} into eng/targets/SharedFx.Common.{props/targets}
* Update the build to produce a `runtime.$rid.Microsoft.AspNetCore.App` package (not just the one with symbols in it)
* Refactor the targets which produce .tar.gz/.zip files into separate projects in `src/Installers/`
* Refactor installers, unit tests, and the framework projects to use ProjectReference to flow dependencies between different parts of the build.
* Makes it easier to build the shared framework locally (for the inner dev loop, you can run `dotnet build -p src/Framework/Microsoft.AspNetCore.App/src/ -r win-x64`)
2018-10-24 15:42:06 -07:00
Hao Kung 91db78cf92
Add safe copy for enumeration (#1052) 2018-10-24 15:10:19 -07:00
Nate McMaster e3dc0edecb
Merge branch 'release/2.2' 2018-10-24 13:07:05 -07:00
Nate McMaster 01f9af21c5
Temporarily stop producing a package for dotnet-httprepl (#505)
This package isn't quite ship-shape yet, so we're delaying this from shipping with 2.2 RTM.

Setting IsPackable=false so we avoid accidentally building a 2.2.0 RTM version of this package along with the rest of the 2.2.0 RTM tools in this repo, like dotnet-watch.
2018-10-24 13:02:25 -07:00
Javier Calvarro Nelson aa88f16b08
Fix cors with creds (#193) 2018-10-24 12:56:07 -07:00
Justin Kotalik 4437c72e30 Merge branch 'merge/release/2.2-to-master' of https://github.com/dotnet-maestro-bot/Templating into merge/release/2.2-to-master 2018-10-24 12:05:12 -07:00
Justin Kotalik 70a786adcd
Make AspNetCoreHostingModel element not be insert when targeting net461 and inprocess => InProcess (#797) 2018-10-24 11:36:07 -07:00
Chris Ross 253f81c2f2
Merge pull request #3049 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-23 16:13:35 -07:00
Chris Ross (ASP.NET) a8073167e7 Revert "Flush response headers #3031"
This reverts commit 277a5502fd.
2018-10-23 15:49:11 -07:00
Chris Ross 9c40a7237c
Merge pull request #260 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-23 15:47:22 -07:00
Chris Ross a5fcd9dd87
Add application/wasm #3681 (#259) 2018-10-23 14:43:47 -07:00
Stephen Halter d0fc981c7e Merge branch 'release/2.2' 2018-10-23 10:47:14 -07:00
James Newton-King 0ef4b4173c
Endpoint routing startup experience (#889) 2018-10-23 13:54:36 +13:00
James Newton-King be0e602d2f
Merge pull request #888 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-23 13:40:24 +13:00
Gert Driesen 25b5ab2c39 Improve performance and reduce allocations in RouteValuesAddressScheme. (#879) 2018-10-23 13:25:43 +13:00
Gert Driesen bc482cd2b0 Minor performance improvement for DfaMatcherBuilder (#854) 2018-10-23 13:25:08 +13:00
James Newton-King 74336f10c7
Merge pull request #887 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-23 11:33:13 +13:00
Chris Ross (ASP.NET) 32532078d6 Log binary data as a parameter #2860 2018-10-22 14:51:29 -07:00
Gert Driesen bcbf2a1a68 Minor performance improvement for UriBuildingContext.ToPathString() with zero-length path. (#880) 2018-10-23 10:20:52 +13:00
Gert Driesen c93e3a76ff Eliminate redundant isValid check from DefaultEndpointSelector.ProcessFinalCandidates(...). (#881) 2018-10-23 10:20:30 +13:00
Gert Driesen 26e5ea3274 Improves performance and reduce allocations in DefaultEndpointDataSource (#882) 2018-10-23 10:20:15 +13:00
Ryan Nowak 4943bc4896 Remove LinkGenerationTemplate
This doesn't really accomplish our goals for 2.2 - I don't have a clear
scenario where I would tell a developer to use this VS something else.
Will reevaluate in 3.0
2018-10-22 14:18:22 -07:00
James Newton-King bc140fc491
Merge pull request #885 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-23 09:18:17 +13:00
Ryan Brandenburg 707b1bbf3b Fix link 2018-10-22 12:48:30 -07:00
Justin Kotalik ffa72f5a0c
Fix two string allocation issues (#1539) 2018-10-22 11:23:14 -07:00
James Newton-King 1d05592cd7
Allow parameter names to match required keys in templates (#872) 2018-10-22 11:29:41 +13:00
James Newton-King fbfbc35b11
Merge pull request #884 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-22 09:09:21 +13:00
Gert Driesen 2081160678 Improve performance and reduce allocations of TemplateSegment (#856) 2018-10-22 08:35:35 +13:00
Gert Driesen 0f90a15cf1 Use Array.Clone() to copy arrays, and avoid copy where applicable (#855) 2018-10-22 08:34:11 +13:00
James Newton-King 96953546e3
Merge pull request #878 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-22 08:29:41 +13:00
Gert Driesen 42914d93ca Declare out variables inline, and use discards (#873) 2018-10-21 14:05:05 +13:00
Chris Ross (ASP.NET) 277a5502fd Flush response headers #3031 2018-10-19 18:00:24 -07:00
Ryan Nowak 61ca323a4a Merge branch 'release/2.2' 2018-10-19 17:25:09 -07:00
Nate McMaster dc37a2c23d
Merge branch 'release/2.2' 2018-10-19 14:11:58 -07:00
Pavel Krymets f1ce94a2cf
Add support for building 2.1 based Server.IIS package (#1534) 2018-10-19 12:42:16 -07:00
Pavel Krymets d3216a66c1
Create a build configuraition to build OOB logging site extension package (#3643) 2018-10-19 12:19:33 -07:00
Chris Ross (ASP.NET) 23a4e11261 Send RST for canceled HTTP/2 writes #3007 2018-10-19 11:03:44 -07:00
Nate McMaster 84ca21ed06
Merge branch 'release/2.2' 2018-10-19 10:26:30 -07:00
Nate McMaster 36add43f11
Merge branch release/2.1 into release/2.2 2018-10-18 16:53:03 -07:00
Justin Kotalik b92c82e97f
Add static shim test (#1505) 2018-10-18 13:58:56 -07:00
dotnet-maestro-bot 31849575f1 Upgrade to .NET Core 2.1.6-servicing-27017-02 2018-10-18 13:48:06 -07:00
Pavel Krymets 293d165a80
Fix flaky disconnect test (#1533) 2018-10-18 12:37:13 -07:00
Chris Ross (ASP.NET) d3f2ca9c9a Do not inherit socket handles #2789 2018-10-18 12:19:58 -07:00
Chris Ross 8f8a09fdf2
Merge pull request #3029 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-18 11:22:00 -07:00
Justin Kotalik 22c737c3ee
Merge pull request #3663 from aspnet/release/2.2
Revert restarting was when installing ANCM (#3662)
2018-10-17 22:45:39 -07:00
Justin Kotalik 6dc4673881
Revert restarting was when installing ANCM (#3662) 2018-10-17 22:44:41 -07:00
Nate McMaster 674401235b
Fix local builds of src/DataProtection/build.cmd 2018-10-17 17:35:01 -07:00
Chris Ross (ASP.NET) 1d3090f056 Only reset the request body pipe for HTTP/1 #3006 2018-10-17 16:28:33 -07:00
Nate McMaster 6994c4fc48
Merge release/2.2 and aspnet/WebSockets master branch 2018-10-17 16:06:14 -07:00
Nate McMaster 9ce78f36d5
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in afeb7fe49b
2018-10-17 15:57:02 -07:00
James Newton-King e51da32e9d
Prefer StringComparison over StringComparer when not using comparers (#870) 2018-10-18 11:55:33 +13:00
Nate McMaster d991c50c82
Merge release/2.1 and aspnet/WebSockets release/2.2 2018-10-17 15:47:04 -07:00
Nate McMaster 24f85a200c
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in a036f920b8
2018-10-17 15:34:25 -07:00
Nate McMaster b1427c759b
Remove the WebSockets submodule 2018-10-17 14:53:22 -07:00
Nate McMaster 9e952a22ed
Merge source code from aspnet/WebSockets 2018-10-17 14:30:38 -07:00
Nate McMaster 5d84c92b74
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganiziation, this source code was found in 67f2c3149e
2018-10-17 14:27:00 -07:00
Ryan Nowak d17d9155c7 Port aspnet/Routing/pull/858 2018-10-17 14:26:30 -07:00
Gert Driesen 5c31f1f455 Add Remove(string key, out object value) overload to RouteValueDictionary (#858)
* Add Remove(string key, out object value) overload to RouteValueDictionary.

* Consistently use _count field instead of Count property in Remove overloads.
Added comment on EnsureCapacity call.
Added test for removing first/middle/last entry.
2018-10-17 13:24:07 -07:00
John Luo 5d337fbd9d Revert "Set default protocol to HTTP/1.x"
This reverts commit 97acb95715.
2018-10-17 12:46:35 -07:00
Nate McMaster 1dfe06323f
Merge branch release/2.2 2018-10-17 11:52:06 -07:00
Nate McMaster 80d3bbfcc9
Update code signing config to exclude .js files in template packages 2018-10-17 11:13:02 -07:00
John Luo 97acb95715 Set default protocol to HTTP/1.x 2018-10-17 11:11:02 -07:00
MK 39c25357c6 Skip extensions in SetCookie parser #1049 (#1050) 2018-10-17 09:48:23 -07:00
Chris Ross (ASP.NET) 4678476063 Merge remote-tracking branch 'origin/release/2.2' 2018-10-17 09:35:20 -07:00
itminus a43587290f fix : DefaultFilesMiddleware serve with unicode path (#257) 2018-10-17 08:07:37 -07:00
Justin Kotalik 3c44d27974
Merge pull request #1514 from aspnet/release/2.2
Merge release/2.2 into master: Fix path to aspnetcoreca.dll for signed output (#1513)
2018-10-16 15:59:08 -07:00
Justin Kotalik b951ac9b64
Fix path to aspnetcoreca.dll for signed output (#1513) 2018-10-16 15:55:15 -07:00
Pavel Krymets 8f99140f30
Add client disconnect logs (#1521) 2018-10-16 15:30:19 -07:00
Nate McMaster 2a37b67d1a
Merge branch 'release/2.2' 2018-10-16 14:30:11 -07:00
Nate McMaster e75dc56327
Sign Newtonsoft.Json with AssemblySigning3rdPartyCertName 2018-10-16 14:29:10 -07:00
Ryan Brandenburg a4a9dbca1c
Merge pull request #778 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-16 13:56:04 -07:00
Nate McMaster 4d631ffed3
Merge branch 'release/2.2' 2018-10-16 12:06:16 -07:00
Nate McMaster a35226131a
Merge branch release/2.2 2018-10-16 12:02:18 -07:00
Nate McMaster 6366deb193
Update dataprotection to 2.2.0-rtm 2018-10-16 11:33:17 -07:00
Nate McMaster b64e64d9e5
Merge branch 'namc/merge-dp-22' into release/2.2 2018-10-16 11:32:28 -07:00
Justin Kotalik 92baa4a75b
Cleanup ANCM installers/ Sign AspNetCore custom action (#1499) (#1502) 2018-10-15 17:46:36 -07:00
Justin Kotalik eced46c579
Cleanup ANCM installers/ Sign AspNetCore custom action (#1499) 2018-10-15 17:10:08 -07:00
Ryan Brandenburg 73f161cc60 Set crossorigin anonymous for integrity 2018-10-15 15:51:46 -07:00
Pavel Krymets 24e2e5ad52
Port startup tests to IIS (#1513) 2018-10-15 11:44:51 -07:00
Nate McMaster 6a14b47ccd
Add infrastructure changes to src/DataProtection can build on its own 2018-10-15 11:17:06 -07:00
Nate McMaster 89e2508acf
Merge branch 'release/2.2' 2018-10-15 11:03:28 -07:00
Ryan Brandenburg bd375fc9ee Fix audit failure 2018-10-15 10:49:40 -07:00
Nate McMaster 3eb0764fae
Reorganize source code from aspnet/DataProtection into a subfolder
Prior to reorg, this source existed at 9c7731f1fa
2018-10-15 10:47:38 -07:00
Pavel Krymets b0deed05be
Add server abort tests (#1510) 2018-10-15 10:33:14 -07:00
Nate McMaster 489a88d21e
Merge aspnet/DataProtection release/2.2 into this repo 2018-10-15 10:21:02 -07:00
Nate McMaster a673bfd741
Add build script and CI config for the DataProtection folder 2018-10-15 10:13:04 -07:00
Nate McMaster 4dfd351c84
Remove DataProtection submodule and update path to DP source code to local folder 2018-10-15 09:46:20 -07:00
Nate McMaster c355f10074
Merge source code from aspnet/DataProtection 2018-10-15 09:40:44 -07:00
Pavel Krymets 0b5973e501
Enable auth tests on IIS (#1511)
* Enable auth tests on IIS

* FB
2018-10-13 10:54:20 -07:00
David 0b76599c31 Improve conformance of replace operations to spec
This ensures that JSON patch "replace" operations are functionally
equivalent to "remove" operations followed by "add" operations at the
same path, as RFC 6902 specifies.

Addresses #110
2018-10-12 19:27:38 -07:00
Nate McMaster 24d13700d7
Merge branch 'release/2.2' 2018-10-12 17:56:10 -07:00
Nate McMaster c37a332a6a
Merge branch 'release/2.1' into release/2.2 2018-10-12 16:56:47 -07:00
Justin Kotalik dbc1d38a58
Move ANCM installers to Universe (#1456) 2018-10-12 14:32:12 -07:00
Nate McMaster fb3f5d95c2
Backport infrastructure changes and source reorganization
* Add build definition for Azure DevOps
* Put code for metapackages in a subfolder
* Update targets to prepare for submodules merging into this repo
* Add source code for windows installer
* Add source code for Debian installers
2018-10-12 13:59:43 -07:00
Stephen Halter 1f2e704dd3
Implement MinResponseDataRate for HTTP/2 (#3003)
#2807
2018-10-12 13:15:46 -07:00
Nate McMaster f4026cc100
Reorganize source code from aspnet/DataProtection into a subfolder
Prior to reorg, this source existed at 3f5f419df8
2018-10-12 13:14:22 -07:00
Peter Blazejewicz 98162cb7df Remove `launchsettings.json` entry from `.gitignore`. Closes #760 (#761)
Do not ignore launchsettings.json. Closes #760

As discussed in:
https://github.com/github/gitignore/pull/2705
https://github.com/github/VisualStudio/issues/1405
2018-10-12 12:58:50 -07:00
Pavel Krymets 642e8e9d7c
Add Basic auth tests and fix Windows auth tests (#1502) 2018-10-12 12:03:11 -07:00
Nate McMaster 4f14cda425
Reorganize source code from aspnet/DataProtection into a subfolder
Prior to reorg, this source existed at b62bb5778b
2018-10-12 10:07:51 -07:00
James Newton-King 14b8c85728
Merge pull request #851 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-12 16:29:21 +13:00
James Newton-King fbf0708f19
Fix DfaGraphWriter ISuppressMatchingMetadata check (#850) 2018-10-12 16:08:50 +13:00
Pranav K e6bdf128f2 Log when a request is an OPTIONS request but not a preflight request
Fixes https://github.com/aspnet/AspNetCore/issues/2375
2018-10-11 16:30:22 -07:00
Chris Ross (ASP.NET) 081cef0934 Track aborted streams for a given grace period #2832 2018-10-11 12:55:26 -07:00
Ryan Brandenburg df394051d0 JQuery Unobtrusive to 3.2.11 2018-10-11 12:29:32 -07:00
Pranav K 2690a3f621 Remove filtering from CorsService
* Add browser based integration tests
2018-10-11 12:23:40 -07:00
Pavel Krymets 1132cad70b
public const string AuthenticationScheme (#1496) 2018-10-11 10:54:00 -07:00
BrennanConroy 9c7731f1fa Merge branch 'release/2.2' 2018-10-11 10:23:24 -07:00
Justin Kotalik 0e04527fb4
General cleanup for client disconnect handling. (#1446) 2018-10-11 08:44:03 -07:00
John Luo 3fe17b9faf Merge branch 'release/2.2' 2018-10-10 18:14:38 -07:00
Ben Adams 800c79c0e4 Fast-path async in HttpResponseStreamWriter 2018-10-10 18:13:58 -07:00
Günther Foidl 773aa6e6ff Http{Request|Response}Stream.ValidateState made inlineable 2018-10-10 17:45:05 -07:00
BrennanConroy 3f5f419df8
Add Redis 2.0 package (#325) 2018-10-10 16:40:52 -07:00
Ryan Brandenburg 7c817289ff
Merge branch 'master' into merge/release/2.2-to-master 2018-10-10 16:29:10 -07:00
Chris Ross (ASP.NET) b2d53bd328 Merge branch 'release/2.2' 2018-10-10 14:35:57 -07:00
Pavel Krymets bfa583a9aa
Guard OnAsyncCompletion from completing request before OnExecuteRequestHandler exits (#1489) 2018-10-10 14:34:55 -07:00
Chris Ross (ASP.NET) 5a3c664566 Merge branch 'release/2.2' 2018-10-10 14:33:17 -07:00
Pavel Krymets ab124fc344
Fix applicationInitialization tests and disconnect handler (#1484) 2018-10-10 12:41:11 -07:00
Ryan Brandenburg 7d09ec6ccc
Low hanging fruit (#763)
Clean up low hanging fruit
2018-10-10 12:12:11 -07:00
James Newton-King f6e20a38e2 HostString throws ArgumentNullException for null host (#1045) 2018-10-10 08:27:33 -07:00
Pavel Krymets 7a09638afe
Modernize startup error pages (#1476) 2018-10-09 16:12:01 -07:00
Pavel Krymets f2fbd803b9
Flow request trace context to CreateApplication (#1480) 2018-10-09 16:11:52 -07:00
Ryan Nowak bb3a30a2fc
Merge branch 'master' into merge/release/2.2-to-master 2018-10-09 13:31:31 -07:00
Pavel Krymets 27e4e1aca3
Remove RestoreOnPublish parameter (#1533) 2018-10-09 10:41:52 -07:00
Justin Kotalik 23db53eae6
Add more FREB events/ tests for FREB events (#1461) 2018-10-09 10:25:12 -07:00
Ryan Nowak 93dc6dd5f5
Merge pull request #846 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-08 18:05:41 -07:00
Ryan Nowak 1f31e0556d
Add IHealthCheckPublisher for push-based checks (#498)
IHealthCheckPublisher allows you to configure and run health checks
regularly inside an application, and push the notifications elsewhere.

All publishers are part of a single queue with a configurable period and
timeout.
2018-10-08 17:58:45 -07:00
Stephen Halter 8bca6b3877
Add HTTP/2 keep-alive and request header timeouts (#2992) 2018-10-08 17:06:15 -07:00
Pavel Krymets 1be7cd1f74
Disconnect the disconnect handler when request processing ends (#1471) 2018-10-08 16:05:28 -07:00
Ryan Nowak 7b16053f27 Misc polishing
Rename `IEndpointFinder<>` -> `IAddressScheme<>`

Address the two 'marker' metadata types that I'm aware of.
2018-10-08 15:45:44 -07:00
Pavel Krymets 4347a45f29
Always add event source logger (#287) 2018-10-08 09:31:44 -07:00
Ryan Nowak 3eb50aebff
Merge pull request #497 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-06 16:57:30 -07:00
Ryan Nowak 9722d89572 Adjust log levels 2018-10-06 16:18:55 -07:00
Ryan Nowak abc169f6ea
Merge pull request #841 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-06 16:13:56 -07:00
Ryan Nowak ce9ace84fd
Merge pull request #839 from aspnet/rynowak/fix-837
Fix Routing#837
2018-10-05 22:26:27 -07:00
Ryan Nowak 13d293ff86 Merge branch 'release/2.2' 2018-10-05 21:30:56 -07:00
Ryan Nowak 81fb93a896 Fix Routing#837
Fixes a few issues with how we initialize the middleare.
- Always completes the intitialization task
- Avoids capturing the ExecutionContext
- Allows initialization to occur repeatedly when it fails
2018-10-05 21:24:57 -07:00
Ryan Nowak 9db2833fc2 Make endpoint selector policies per-candidate-set
This allows us to filter `IEndpointSelectorPolicy` instance based on
whether the apply to a given candidate set. This should allow us to
remove some HAXXX from MVC.

The idea here is the ESP becomes much more pay-for-play if you can
statically eliminate many of the cases where it would usually no op.
2018-10-05 21:03:59 -07:00
Ryan Nowak d4ef24ab2c
Merge pull request #836 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-05 20:14:12 -07:00
Ryan Nowak af47b27f0d Add blurb about Host header 2018-10-05 19:03:21 -07:00
John Luo 5b90028fe3 Expose status code of BadHttpRequestException 2018-10-05 16:08:33 -07:00
Chris Ross (ASP.NET) daf6e1ecd7 Http/2 response trailers #622 2018-10-05 12:50:46 -07:00
Chris Ross (ASP.NET) 7fd01fb90d Merge branch 'release/2.2' 2018-10-05 11:49:02 -07:00
Chris Ross (ASP.NET) 89b0430bda Add IHttpResponseTrailersFeature and extensions 2018-10-05 11:46:52 -07:00
Pranav K 6f76189846
Normalize internationalized domain names when adding to CORS
Fixes https://github.com/aspnet/Home/issues/3353
2018-10-05 11:08:02 -07:00
George Drak e9eea50966 Implement #2230 - Consume BindingAddress instead of ServerAddress (#2975)
* #2230 Mark ServerAddress as obsolete

* #2230 suppress CS0618 errors for obsoleted ServerAddress class

* #2230 Use BindingAddress instead of ServerAddress
2018-10-05 10:34:00 -07:00
Luke Latham e30ae8cc3d Fix typo (#1559) 2018-10-05 08:11:04 -07:00
Jo Ham fc6ac2361e Fix Typo (#1044) 2018-10-05 07:52:15 -07:00
Stephen Halter f91ae20a3c
Improve RequestAborted token handling (#2977)
- Improve test reliability of tests verifying the RequestAborted token gets tripped
- Once the response body is completed, don't fire the token for that request even if it is accessed later on.
2018-10-04 16:48:50 -07:00
Andrei Amialchenia df2ad98743 Use logical 'or' instead of bitwise in IsConnectionReset method. (#2983) 2018-10-04 15:37:24 -07:00
Chris Ross (ASP.NET) 35d35f22a3 Disallow any frames after a reset is received #2154 2018-10-04 09:40:21 -07:00
Stephen Halter 5bd2a41517
Make transport logs for connection close more detailed and consistent (#2978) 2018-10-03 12:41:00 -07:00
Nate McMaster ef18c467aa
Merge branch 'release/2.2' 2018-10-02 14:45:17 -07:00
Nate McMaster f2691ee4b6
Add a copy of scripts from dotnet-deb-tool 2.0.0 to this repo (#1442)
We currently build .deb files using dotnet-deb-tool, which comes from a package feed. We're not completely sure where the source code is for this tool, so this moves the scripts from the dotnet-deb-tool 2.0.0 package into this repo for safe keeping.
2018-10-02 14:32:12 -07:00
Nate McMaster 1e41958884
Merge branch 'release/2.2' 2018-10-02 09:23:42 -07:00
Nate McMaster 4c49d5ce80
Resolve flaky tests (#497)
1. Prevent an ObjectDisposedException in dotnet-watch on slower machines
2. Fix flakiness caused by PID reuse
3. Fix flakiness in tests that await the restart of dotnet-watch. The `.TimeoutAfter` method doesn't cancel the long-running task. This left 2 readers running on dotnet-watch output which caused indeterminate test outcome.
2018-10-02 09:17:04 -07:00
James Newton-King 5f75c07bbf
Add RoutesValues to HttpRequest (#1042) 2018-10-02 16:03:58 +13:00
Nate McMaster 18e245ecf0
Merge branch 'release/2.2' 2018-10-01 16:00:30 -07:00
Nate McMaster 7d3628b8ac
Merge branch 'release/2.1' into release/2.2 2018-10-01 15:58:37 -07:00
Ryan Nowak f0623fff60 Merge branch 'release/2.2' 2018-10-01 13:38:48 -07:00
Ryan Nowak 014e7eb963 Add EFCore DbContext check 2018-10-01 13:33:00 -07:00
Justin Kotalik 3ddc86a428
Fix mof file (#1457) 2018-10-01 08:00:44 -07:00
Ryan Nowak 3863601f1d
Merge pull request #832 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-09-30 16:50:15 -07:00
Ryan Nowak 3227de8c0b Fix #629 - Add logging to DfaMatcther
Adds logging for the most common things that can prevent an endpoint
from matching.

Note that we already have good logging in other parts of the system, the
stuff here completes the story by providing details at the debug level.
2018-09-30 15:59:25 -07:00
Ryan Nowak 632d980cd1 Merge branch 'release/2.2' 2018-09-30 14:14:48 -07:00
Ryan Nowak b7939328b8 feedback 2018-09-30 14:09:59 -07:00
Ryan Nowak a2f404f4d5 Perf improvements for EndpointSelector 2018-09-30 14:09:59 -07:00
Ryan Nowak ed15bad5fb Make CandidateState (publicly) immutable 2018-09-30 14:09:59 -07:00
Ryan Nowak 1f5eec1d55 Rename EndpointFeature -> EndpointSelectorContext 2018-09-30 14:09:59 -07:00
James Newton-King 87084945a6
Merge release/2.2 2018-09-30 09:51:30 +13:00
Ryan Nowak 8b99832eaf Add ASCII optimized jump tables 2018-09-29 12:55:10 -07:00
James Newton-King d1f3b90a0e
RouteValuesAddressMetadata ctors and XML docs (#818) 2018-09-30 08:54:59 +13:00
Nate McMaster 72cd5eedcf
Prepare the 2.1.6 patch (#1434) 2018-09-28 17:57:33 -07:00
Nate McMaster 00e2b6201e
automated: merge branch release/2.2 2018-09-28 17:28:07 -07:00
Nate McMaster 3483a32505
automated: merge branch release/2.2 2018-09-28 17:27:30 -07:00
Nate McMaster f1bb7acd5a
automated: merge branch release/2.2 2018-09-28 17:27:28 -07:00