Commit Graph

44342 Commits

Author SHA1 Message Date
John Luo e8fec8eb52
Enable symbols generation for crossgen'ed assemblies on linux-arm (#3877) 2018-11-02 18:06:04 -07:00
John Luo 07ae9c273a Merge branch 'release/2.2' 2018-11-02 16:01:20 -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
Javier Calvarro Nelson 7421ba8087
Merge release/2.2 -> master
Fixes integrity validation in Identity UI V3
2018-11-02 14:57:25 -07:00
Javier Calvarro Nelson 99f352a92f
javiercn/check-integrity-validation (#2052) 2018-11-02 14:48:06 -07:00
Justin Kotalik dcece2090c
Remove IISIntegration submodule, add CI (#3867) 2018-11-02 14:34:31 -07:00
Nate McMaster 51dd4c6f34 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from 7e8a6be7ed
2018-11-02 12:08:13 -07:00
ASP.NET CI 341a648511 Updating submodule(s)
EntityFrameworkCore => c3eb2b04453ded94799ccd83ff32168b559379a7
KestrelHttpServer => 40a9b18c43

[auto-updated: submodules]
2018-11-02 12:05:26 -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
John Luo 40a9b18c43 Ignore certificate errors 2018-11-02 11:02:11 -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
Nate McMaster 1ab2caa431
Update list of files to include DependencyInjection 2018-11-02 10:44:15 -07:00
Nate McMaster b8ea420f19 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from f7a39962bb
2018-11-02 10:31:56 -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
Nate McMaster c92536a21a
Remove the DependencyInjection submodule 2018-11-02 09:58:20 -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
BrennanConroy b2037efa08
Merge pull request #3250 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-11-02 08:27:42 -07:00
Nate McMaster 574a034ddd Reorganize source code in preparation to move into aspnet/Extensions
Prior to reorganization, this source code was found in https://github.com/aspnet/FileSystem/tree/dotnet/extensions@baebb8b0c672ab37bac72d7196da1b919d362cc5
\n\nCommit migrated from c087cadf1d
2018-11-02 03:25:45 -07:00
Nate McMaster b0441192c3 Merge branch 'release/2.2'
\n\nCommit migrated from 3ba072c253
2018-11-02 01:32:56 -07:00
Nate McMaster 3b2dd5bee8 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from 5b8b6c7a52
2018-11-02 01:28:11 -07:00
Nate McMaster 6d1eb9b8c4 Merge the source code from aspnet/DependencyInjection release/2.1
\n\nCommit migrated from 8b174f1f34
2018-11-02 01:22:41 -07:00
Nate McMaster 5261569b61 Reorganize source code in preparation to move into aspnet/Extensions
Prior to reorganization, this source code was found in https://github.com/aspnet/DependencyInjection/tree/dotnet/extensions@7a283947c231b6585c8ac95e653950b660f3da96
\n\nCommit migrated from 689c4a891c
2018-11-02 00:22:14 -07:00
ASP.NET CI e9749786a8 Updating submodule(s)
ServerTests => 04c6c6bab8
SignalR => b006a2c789

[auto-updated: submodules]
2018-11-02 07:05:36 +00:00
Nate McMaster 303ee1ff56
Fix the filename for the debian installer 2018-11-01 22:50:58 -07:00
Pranav K 7ea301cc0a Fix RazorRendering 2018-11-01 19:19:59 -07:00
Nate McMaster a12cdc33f6 Merge branch 'release/2.2'
\n\nCommit migrated from 8d8f55bdd7
2018-11-01 19:08:04 -07:00
Nate McMaster e295d0506e
Ignore GROUP_ID when building the RHEL docker build image 2018-11-01 17:37:03 -07:00
Nate McMaster 4527d7e312 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from 712de22643
2018-11-01 17:32:01 -07:00
BrennanConroy b006a2c789
Clean up logging (#3247) 2018-11-01 15:47:01 -07:00
BrennanConroy 172b635886
Merge pull request #3249 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-11-01 15:18:27 -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
Justin Kotalik 880dd2b706 Fix malformed korebuild lock file 2018-11-01 14:45:15 -07:00
ASP.NET CI 7842a73986 Updating submodule(s)
ServerTests => 019ba1722e

[auto-updated: submodules]
2018-11-01 14:42:59 -07:00
Justin Kotalik b7162e23ca Merge branch 'release/2.2' 2018-11-01 14:42:53 -07:00
Justin Kotalik 04c6c6bab8 Merge branch 'release/2.1' into release/2.2 2018-11-01 14:39:40 -07:00
Justin Kotalik 019ba1722e
Remove unused M.A.Server.IIS package (#150) 2018-11-01 14:38:46 -07:00
ASP.NET CI 7388b64ed9 Updating BuildTools from 2.2.0-preview2-20181031.7 to 2.2.0-preview2-20181101.2
[auto-updated: buildtools]
2018-11-01 14:18:04 -07:00
ASP.NET CI 878542e3fc Updating submodule(s)
DotNetTools => d745b8c161
Identity => b56dc070fb

[auto-updated: submodules]
2018-11-01 14:17:56 -07:00
Nate McMaster 5abb3f1f57
Merge branch 'release/2.2' 2018-11-01 14:15:50 -07:00
Nate McMaster 95205d9994
Merge branch 'release/2.2' 2018-11-01 14:02:07 -07:00
Nate McMaster b56dc070fb
Ensure ApiAuthorization.IdentityServer doesn't build a 2.2.0 package with the rest of RTM (#2049) 2018-11-01 13:32:23 -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
ASP.NET CI 4fc16c87e9 Updating submodule(s)
DotNetTools => fbca8be404
SignalR => 4496366794

[auto-updated: submodules]
2018-11-01 12:04:14 -07:00
Javier Calvarro Nelson e367b82794
Merge pull request #3862 from aspnet/javiercn/auth-server
Add auth server package
2018-11-01 11:58:37 -07:00