Commit Graph

27752 Commits

Author SHA1 Message Date
David Fowler 113a827c0e Merge branch 'release/2.1' into dev 2018-03-27 13:29:00 -07:00
David Fowler bc91191876
More benchmark command fixes 2018-03-27 13:26:55 -07:00
David Fowler df317cffca
Fixing benchmarks 2018-03-27 13:17:22 -07:00
Pranav K a72b56f49e
Merge branch 'release/2.1' into dev 2018-03-27 12:29:36 -07:00
Pranav K f272f7bfc2
Merge pull request #256 from aspnet/release/2.1
Use x64 binaries when project's targeting AnyCPU (#255)
2018-03-27 12:28:49 -07:00
Pranav K ad724f6b0a
Use x64 binaries when project's targeting AnyCPU (#255)
* Use x64 binaries when project's targeting AnyCPU

Fixes https://github.com/aspnet/MvcPrecompilation/issues/240
2018-03-27 12:27:46 -07:00
Pranav K 927af3125e
Use RazorCompiledItemMetadataAttribute to calculate route 2018-03-27 12:24:37 -07:00
Chris Ross (ASP.NET) fc1e40e6d1 Merge branch 'release/2.1' into dev 2018-03-27 12:21:31 -07:00
Pranav K 711a0d7003
Merge remote-tracking branch 'origin/release/2.1' into dev 2018-03-27 12:15:34 -07:00
Chris Ross (ASP.NET) f25f411b68 Add HostFiltering configuration to templates 2018-03-27 12:13:24 -07:00
Chris Ross (ASP.NET) b6b438f5fb Merge branch 'release/2.1' into dev
# Conflicts:
#	build/dependencies.props
2018-03-27 12:11:20 -07:00
Pranav K 62fec52a9f Add a framework specific reference to Microsoft.DiaSymReader.Native
Fixes https://github.com/aspnet/Mvc/issues/7478
2018-03-27 12:08:46 -07:00
ASP.NET CI fb848c366a Updating submodule(s)
Diagnostics => db1bdc7ede
IISIntegration => 2233dcf509
MetaPackages => 0e7f12bfb3

[auto-updated: submodules]
2018-03-27 12:07:07 -07:00
Pranav K 3fe479ab83
Add MicrosoftDiaSymReaderNativePackageVersion 2018-03-27 11:58:37 -07:00
Ryan Brandenburg 428e470e83
Fix UpdateDependencies script for maestro 2018-03-27 11:58:06 -07:00
dotnet-maestro-bot 3d88d912e6
Updating external dependencies to '20180325-03-1519352' (#998) 2018-03-27 11:57:48 -07:00
Pranav K d9bbc74aee
Merge remote-tracking branch 'origin/release/2.1' into prkrishn/merge2.1 2018-03-27 11:57:39 -07:00
Pranav K 895ccb6b10 Add MicrosoftDiaSymReaderNativePackageVersion 2018-03-27 11:28:44 -07:00
ASP.NET CI d877403d90 Updating submodule(s)
Razor => 15a74a8f80
SignalR => d598a909a2

[auto-updated: submodules]
2018-03-27 18:20:34 +00:00
Ajay Bhargav Baaskaran 3b32a32be7 Merge branch 'release/2.1' into dev 2018-03-27 11:05:36 -07:00
Ajay Bhargav Baaskaran db1bdc7ede Upgraded dependencies 2018-03-27 11:02:35 -07:00
ASP.NET CI d8bc393231 Updating submodule(s)
Razor => d1215d8fa1
SignalR => 185453908f

[auto-updated: submodules]
2018-03-27 10:55:48 -07:00
Yanbing Shi 2233dcf509
Merge pull request #718 from aspnet/bangbingsyb/ancm-stress
IIS ANCM stress test application
2018-03-27 10:52:57 -07:00
Ajay Bhargav Baaskaran 15a74a8f80 Merge branch 'release/2.1' into dev 2018-03-27 10:47:45 -07:00
Ajay Bhargav Baaskaran d1215d8fa1 Skip checking thumbprint of file in osx 2018-03-27 10:46:49 -07:00
Nate McMaster 87613d0e41
Fix typo in restore sources 2018-03-27 10:29:40 -07:00
David Fowler d598a909a2 Merge branch 'release/2.1' into dev 2018-03-27 10:26:57 -07:00
David Fowler 185453908f
Remove HubConnectionContext parameter from IHubProtocolResolver (#1735) 2018-03-27 10:25:00 -07:00
ASP.NET CI c9e4d1aadc Updating submodule(s)
SignalR => b7e2678592

[auto-updated: submodules]
2018-03-27 10:18:39 -07:00
ASP.NET CI 5cefe95231 Updating submodule(s)
Mvc => 203ebb64ed

[auto-updated: submodules]
2018-03-27 10:16:14 -07:00
BrennanConroy 6547edb58a
Merge pull request #1736 from aspnet/release/2.1
Add new SignalR scenarios (#1730)
2018-03-27 10:14:34 -07:00
BrennanConroy b7e2678592
Add new SignalR scenarios (#1730) 2018-03-27 10:14:08 -07:00
dotnet-maestro-bot d6c296ba8c Updating external dependencies to '20180325-03-1519352' (#998) 2018-03-27 10:08:13 -07:00
Kiran Challa 203ebb64ed Updated dependencies.props 2018-03-27 10:07:35 -07:00
Nate McMaster d94db644e3
Backport: separate list of dependency versions and dependency items, and stop issuing KRB4002 on duplicates 2018-03-27 10:06:56 -07:00
Kiran Challa 1186fa66ab Merge branch 'release/2.1' into dev 2018-03-27 10:06:51 -07:00
ASP.NET CI 1ca7d326e3 Updating submodule(s)
Templating => 476fd815a4

[auto-updated: submodules]
2018-03-27 09:05:35 -07:00
ASP.NET CI 26f6f70f0a Updating submodule(s)
Templating => ade5ae534d

[auto-updated: submodules]
2018-03-27 09:04:40 -07:00
Nate McMaster 083e704b81
Remove docs for features that were never implemented 2018-03-27 09:04:12 -07:00
Nate McMaster 7fffc939cf
Backport: consolidate list of myget feeds to one place and remove the need to mirror packages 2018-03-27 09:03:44 -07:00
Pranav K 476fd815a4
Merge pull request #412 from aspnet/release/2.1
Set DebugType=full for .NET Framework projects
2018-03-27 09:00:15 -07:00
Pranav K ade5ae534d Set DebugType=full for .NET Framework projects 2018-03-27 08:59:54 -07:00
ASP.NET CI 9cfdac3acb Updating submodule(s)
Mvc => 0c084fa28a

[auto-updated: submodules]
2018-03-27 12:33:26 +00:00
Kiran Challa 0c084fa28a [Fixes #7518] NullReferenceException thrown when Controller method uses Guid parameter default value 2018-03-27 05:22:20 -07:00
ASP.NET CI b2e7249174 Updating submodule(s)
KestrelHttpServer => 46ab09ca36
SignalR => dcd773d10d

[auto-updated: submodules]
2018-03-27 03:18:56 -07:00
David Fowler dcd773d10d Merged release/2.1 2018-03-27 03:03:10 -07:00
ASP.NET CI ab210e3b98 Updating submodule(s)
KestrelHttpServer => be04ccac6e
SignalR => 7a9160f3e0

[auto-updated: submodules]
2018-03-27 09:08:37 +00:00
David Fowler 46ab09ca36 Merge branch 'release/2.1' into dev 2018-03-27 02:08:35 -07:00
David Fowler 7a9160f3e0
React to https://github.com/aspnet/KestrelHttpServer/pull/2428 (#1734) 2018-03-27 02:02:29 -07:00
David Fowler be04ccac6e
Move DuplexPipe into Kestrel.Core as internal (#2428) 2018-03-27 02:02:15 -07:00