Commit Graph

44788 Commits

Author SHA1 Message Date
Nate McMaster df46dfee73
Merge branch 'release/2.2' 2018-11-06 12:13:05 -08:00
Nate McMaster 67c3a099ec
Remove the aspnet/Configuration submodule (#3948) 2018-11-06 12:04:36 -08:00
Nate McMaster bc554e59a6 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from c205682825
2018-11-06 11:33:59 -08:00
Nate McMaster 122c2c78e2 Merge branch 'release/2.2'
\n\nCommit migrated from 5054f8a0e5
2018-11-06 11:07:40 -08:00
Nate McMaster a24b4ee459
Reduce flakiness in tests caused by the OS re-using the PID on test processes (#512)
We were using PID to assert that dotnet-watch had restarted processes. The OS does not guaranteed the uniqueness of PID, so I've changed tests to use PID + process start time to distinguish between processes.
2018-11-06 09:57:17 -08:00
Nate McMaster 1d3bca1f31 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from 8d5274d7f8
2018-11-06 09:47:51 -08:00
Nate McMaster 7f95d6af34
Remove everything from the package archive except Microsoft.AspNetCore.App 2018-11-06 09:43:51 -08:00
Chris Ross (ASP.NET) 60af147f03 Remove net472 test target 2018-11-06 09:39:09 -08:00
BrennanConroy ffd4bcd850
Server per test (#3253) 2018-11-06 09:33:15 -08:00
BrennanConroy 71e2f45450
Wrap log in enabled check 2018-11-06 09:24:34 -08:00
Nate McMaster 4f887e5cd4
Merge branch 'release/2.1' into release/2.2 2018-11-06 09:23:17 -08:00
Chris Ross (ASP.NET) a3eae74580 Merge branch 'release/2.2' 2018-11-06 09:13:00 -08:00
Nate McMaster 17cccade43
Add IsFinalBuild switch to Windows installer script (#3892) 2018-11-06 09:06:10 -08:00
ASP.NET CI 6dc73e256c Updating BuildTools from 3.0.0-alpha1-20181105.2 to 3.0.0-alpha1-20181105.4
[auto-updated: buildtools]
2018-11-06 00:06:08 -08:00
ASP.NET CI a3ff786e5e Updating submodule(s)
Mvc => 65af12f1f5
Routing => 444bf1d93f

[auto-updated: submodules]
2018-11-06 00:06:00 -08:00
ASP.NET CI 4059e28a3b Updating BuildTools from 2.2.0-preview2-20181104.4 to 2.2.0-preview2-20181105.3
[auto-updated: buildtools]
2018-11-06 00:04:32 -08:00
Ajay Bhargav Baaskaran fd4572874e Increase timeout for msbuild processes and added better logging 2018-11-05 18:14:45 -08:00
James Newton-King 444bf1d93f
Add branching functional tests (#905) 2018-11-06 14:23:37 +13:00
ASP.NET CI 0f4ae66176 Updating BuildTools from 3.0.0-alpha1-20181029.3 to 3.0.0-alpha1-20181105.2
[auto-updated: buildtools]
2018-11-06 01:19:48 +00:00
ASP.NET CI cdbe6227c5 Updating submodule(s)
AADIntegration => e27088d9d9
AuthSamples => 3d0793fec4
AzureIntegration => 90b5a51ac4
CORS => be53aa9cac
Diagnostics => c9a53b9067
DotNetTools => 9de04520e0
EntityFrameworkCore => e3cecb21eddd4080d73227ede1cab3ccc49d1b26
HttpAbstractions => 187e89f6f0
HttpSysServer => 2451b68ca0
Identity => 7421ba8087
JavaScriptServices => f47c5901b6
JsonPatch => 891ae28851
KestrelHttpServer => 3327267396
Logging => b454c5a67eeecd388095519dc576944b4434ead0
MetaPackages => 62d9794c63
MusicStore => 2f747d5055
Mvc => 7ea301cc0a
Razor => c0fb1a84cf
ServerTests => 880dd2b706
SignalR => b2037efa08
Templating => 7100d1a797

[auto-updated: submodules]
2018-11-06 01:19:39 +00:00
Nate McMaster 8d17a5b9f3 Merge source code from aspnet/Configuration into this repo
\n\nCommit migrated from 8a9b64a3e5
2018-11-05 17:19:10 -08:00
Pranav K 65af12f1f5 Update Sdk \ KoreBuild to one that works 2018-11-05 17:17:17 -08:00
Nate McMaster ddd07556e9
Add Newtonsoft.Json.Bson to code signing configuration 2018-11-05 17:14:07 -08:00
Nate McMaster f8a1e14921
Merge branch 'release/2.2' 2018-11-05 16:35:20 -08:00
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