Commit Graph

42564 Commits

Author SHA1 Message Date
Nate McMaster ac89e3e9bf Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from d94eb17013
2018-11-05 16:20:37 -08:00
Nate McMaster 09e84b256c Reorganize source code in preparation to move into aspnet/Extensions
Prior to reorganization, this source code was found in https://github.com/aspnet/Configuration/tree/dotnet/extensions@ef29dc86b970893147fd2a27d527f5a907af9fdd
\n\nCommit migrated from a8900855a4
2018-11-05 16:15:42 -08:00
ASP.NET CI 8558942d97 Updating BuildTools from 2.1.3-rtm-15838 to 2.1.3-rtm-15839
[auto-updated: buildtools]
2018-11-05 16:14:04 -08:00
Nate McMaster 5eac0befd0
Include assemblies from aspnet/FileSystem in the list of assemblies to code-signing 2018-11-05 15:21:03 -08:00
Nate McMaster 62b24f930e
Remove the aspnet/FileSystem submodule (#3884) 2018-11-05 14:19:19 -08:00
Nate McMaster 0757dd7b80 Merge branch 'release/2.2'
\n\nCommit migrated from 4435c3565d
2018-11-05 14:03:44 -08:00
Nate McMaster 923fa4d586 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from f9712e2491
2018-11-05 13:21:52 -08:00
Nate McMaster 2fa46e6e89 Merge aspnet/FileSystem into this repo
\n\nCommit migrated from 47696ac4a9
2018-11-05 13:19:52 -08:00
Nate McMaster 360b19ca09 Merge branch 'release/2.2'
\n\nCommit migrated from 04bac2f79c
2018-11-05 13:12:14 -08:00
Nate McMaster 376a6c9953 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from 2d15280464
2018-11-05 13:10:48 -08:00
ASP.NET CI f454ec3b16 Updating BuildTools from 2.2.0-preview2-20181101.2 to 2.2.0-preview2-20181104.4
[auto-updated: buildtools]
2018-11-05 12:03:59 -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
dotnet-maestro-bot 9d794af34d Update to .NET Core 2.2.0-rtm-27105-02 and Extensions 2.2.0-rtm-181105-01 2018-11-05 10:12:15 -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
Nate McMaster 4155f5584c Merge branch 'release/2.2'
\n\nCommit migrated from a550d3ebf0
2018-11-04 15:38:00 -08:00
Nate McMaster e667a1a0bc Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from cf4d6c3a3b
2018-11-04 15:13:00 -08:00
ASP.NET CI dc240c52f9 Updating BuildTools from 2.1.3-rtm-15837 to 2.1.3-rtm-15838
[auto-updated: buildtools]
2018-11-04 14:50:26 -08:00
Nate McMaster aee5320ae9 Organize packages into different output paths based on whether they are "product" packages or not
\n\nCommit migrated from dbb97a2e13
2018-11-04 14:22:06 -08:00
ASP.NET CI 10f415bb55 Updating BuildTools from 2.1.3-rtm-15836 to 2.1.3-rtm-15837
[auto-updated: buildtools]
2018-11-04 11:46:42 -08:00
ASP.NET CI f3809a8b97 Updating submodule(s)
EntityFrameworkCore => 1032daf61fae290f9139d07fb9f6c2b847a48d60
Identity => 99f352a92f

[auto-updated: submodules]
2018-11-03 00:05:09 -07:00
John Luo 591a6ddb08 Merge branch 'release/2.2' 2018-11-02 18:06:36 -07: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 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