Commit Graph

43822 Commits

Author SHA1 Message Date
Nate McMaster c0f86d5687 Use ItemDefinitionGroup to simplify the list of packages.
See https://docs.microsoft.com/en-us/visualstudio/msbuild/item-definitions
2017-05-03 12:21:35 -07:00
Nate McMaster 655f70717e Merge branch 'rel/2.0.0-preview1' into dev 2017-05-03 12:20:43 -07:00
Nate McMaster ebdc68ac10 Exclude SQLitePCl.bundle_green targets when reference included via the Microsoft.AspNetCore.All metapackage 2017-05-03 12:18:50 -07:00
Cesar Blum Silveira a443068260 Merge branch 'rel/2.0.0-preview1' into dev 2017-05-03 11:49:07 -07:00
Cesar Blum Silveira 634c9c180c Fix HTTPS functional tests on macOS (#96). 2017-05-03 11:48:37 -07:00
Cesar Blum Silveira fbd3d9438a Store sample app's certificate passwords in user secrets. 2017-05-03 11:44:29 -07:00
Mike Harder a23a255e2e Fix whitespace. 2017-05-03 11:43:39 -07:00
Mike Harder cfc41d3845 Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-03 11:42:10 -07:00
Mike Harder f060c8a67b Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-03 11:35:24 -07:00
Mike Harder 6ab84e0f27 Move System.Data.SqlClient version from csproj to dependencies.props (#786) 2017-05-03 11:31:08 -07:00
Mike Harder db517803c8 Move System.Data.SqlClient version from csproj to dependencies.props (#293) 2017-05-03 11:30:51 -07:00
BrennanConroy e96096e760 Merge branch 'rel/2.0.0-preview1' into dev 2017-05-03 10:39:46 -07:00
BrennanConroy 0a3c7001d4 React to Logging API changes (#433) 2017-05-03 10:39:29 -07:00
John Luo 883ef21206 Merge branch 'rel/2.0.0-preview1' into dev 2017-05-03 10:38:11 -07:00
John Luo 781fa1944e Fix ConfigureLogging doc comments 2017-05-03 10:37:45 -07:00
Chris Ross (ASP.NET) dcbd39c1fd Merge branch 'rel/2.0.0-preview1' into dev 2017-05-03 10:32:35 -07:00
Chris Ross (ASP.NET) d74040786c #1053 Prevent IISExpressDeployer.Dispose nullref if the process failed to start 2017-05-03 09:40:07 -07:00
Steve Sanderson 6f3a295041 React to new ObjectMethodExecutor in Common 2017-05-03 15:40:02 +01:00
John Luo e0778b2fb5 Merge branch 'rel/2.0.0-preview1' into dev 2017-05-02 17:17:00 -07:00
BrennanConroy 226058c1bf Merge branch 'rel/2.0.0-preview1' into dev 2017-05-02 16:47:27 -07:00
BrennanConroy 1ca8374028 Fix UseAzureAppServices_RegisterLogger test 2017-05-02 16:47:08 -07:00
Pavel Krymets f1d0791a22 Merge branch 'rel/2.0.0-preview1' into dev 2017-05-02 15:59:43 -07:00
Pavel Krymets 0faf6a21ce Fix test host crash caused by having both TargetFrameworks and TargetFramework (#44) 2017-05-02 15:59:24 -07:00
BrennanConroy 769b6b2ac6 Merge branch 'rel/2.0.0-preview1' into dev 2017-05-02 15:36:09 -07:00
BrennanConroy e96e2872f5 React to Logging API changes (#33) 2017-05-02 15:35:53 -07:00
BrennanConroy 190f2d371d Merge branch 'rel/2.0.0-preview1' into dev 2017-05-02 15:24:21 -07:00
BrennanConroy 1018f41f15 Missed some obsolete logging calls 2017-05-02 15:23:21 -07:00
Jass Bagga f0c85abbaf Correct RangeHelper documentation 2017-05-02 15:17:55 -07:00
John Luo dc44c1f123 Use win7-x64/x86 rids for runtime store 2017-05-02 14:28:22 -07:00
John Luo e1ff1583be Merge branch 'rel/2.0.0-preview1' into dev 2017-05-02 13:47:27 -07:00
John Luo fe455f33ab fix build: Depend on the Hosting package instead of Hosting.Abstractions 2017-05-02 13:47:09 -07:00
BrennanConroy e55bce2db3 Merge branch 'rel/2.0.0-preview1' into dev 2017-05-02 13:41:42 -07:00
BrennanConroy 95eb1cdae7 Force 2.0.0 dependencies for ApplicationInsights (#36) 2017-05-02 13:36:50 -07:00
John Luo a1b729184c Merge branch 'rel/2.0.0-preview1' into dev 2017-05-02 13:01:43 -07:00
John Luo 3c358e9028 Replace ConfigureLogging(Action<ILoggerFactory>) with ConfigureLogging(Action<LoggerFactory>) extension 2017-05-02 13:01:07 -07:00
Kiran Challa 35cd198d9b Remove async keyword and return completed task 2017-05-02 12:56:05 -07:00
Pranav K 720a47765d Re-enable baseline check for ViewFeatures\r\nFixes #6186 2017-05-02 11:51:01 -07:00
Pranav K 33fddca251 Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-01 22:02:53 -07:00
Pranav K 91ad1c60f1 Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-01 22:02:49 -07:00
Pranav K 831386093f Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-01 22:02:48 -07:00
Pranav K ec4f612d86 Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-01 22:02:46 -07:00
Pranav K 544e4fb7b5 Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-01 22:02:44 -07:00
Pranav K e97ed66534 Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-01 22:02:41 -07:00
Pranav K d30ef1f298 Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-01 22:02:37 -07:00
Pranav K 1c8a4572cb Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-01 22:02:35 -07:00
Pranav K e6c8ea8341 Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-01 22:02:34 -07:00
Pranav K 64d0be81c0 Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-01 22:02:28 -07:00
Pranav K 18b62c592f Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-01 22:02:27 -07:00
Pranav K a55051179e Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-01 22:02:24 -07:00
Pranav K 83c06b2f31 Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev 2017-05-01 22:02:16 -07:00