Commit Graph

2738 Commits

Author SHA1 Message Date
Nate McMaster 3918724616
Merge branch 'release/2.1' into release/2.2 2018-11-08 08:31:22 -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 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
Nate McMaster 011cf21a5c
Merge branch 'release/2.2' 2018-11-06 17:42:44 -08:00
Pavel Krymets 9d570d791f
Remove obsolete logging API usage (#3953) 2018-11-06 14:50:35 -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
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
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
Nate McMaster 969fb9bf48
Update projects in src/Framework/ to netcoreapp3.0 2018-10-30 10:41:24 -07:00
Nate McMaster 5e4166f940
Merge branch 'release/2.2' 2018-10-29 16:05:19 -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
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
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
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 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
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
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
Stephen Halter d0fc981c7e Merge branch 'release/2.2' 2018-10-23 10:47:14 -07:00
Chris Ross (ASP.NET) 32532078d6 Log binary data as a parameter #2860 2018-10-22 14:51:29 -07:00
Justin Kotalik ffa72f5a0c
Fix two string allocation issues (#1539) 2018-10-22 11:23:14 -07:00
Chris Ross (ASP.NET) 277a5502fd Flush response headers #3031 2018-10-19 18:00:24 -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
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
John Luo 5d337fbd9d Revert "Set default protocol to HTTP/1.x"
This reverts commit 97acb95715.
2018-10-17 12:46:35 -07:00
John Luo 97acb95715 Set default protocol to HTTP/1.x 2018-10-17 11:11:02 -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