huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
37,701 Commits 1 Branch 0 Tags 251 MiB
Commit Graph

37701 Commits

Author SHA1 Message Date
Nate McMaster e3b23a9fd8 Merge branch 'release/2.1' into dev 2018-01-25 12:27:21 -08:00
N. Taylor Mullen 771a7e35a4 Add MVC support for RazorProjectEngine. 
- Make `RazorProjectEngine` call paths for all feature registrations.
- Add `DefaultMvcImportFeature` for latest and 1.X MVC.
- Ported `AddTargetExtension` and `AddDirective` to `RazorProjectEngineBuilderExtensions`.
- Added tests and a test file system project type.
- Moved obsolete `IRazorEngineBuilder` methods to the bottom of each file. Will actually obsolete the methods once `RazorProjectEngine` is working end-to-end.

#1828
 2018-01-25 12:26:11 -08:00
Nate McMaster 9000769449 Update tests to only bind to the loopback IP address 
Prevents dozens of firewall prompts from appearing while running tests
 2018-01-25 12:25:34 -08:00
Nate McMaster 354905dc00 Set NodeJS 8 as a required toolset 2018-01-25 12:25:34 -08:00
Nate McMaster 04dfc5cc6b Remove RuntimeFrameworkVersion from the templates 
This property is no longer needed because the Microsoft.AspNetCore.All and .App packages set the shared framework version. RuntimeFrameworkVersion is inferred by Microsoft.NET.Sdk
 2018-01-25 12:25:34 -08:00
Steve Sanderson b2373e157e Support Webpack configs authored in TypeScript. Covers #1301 2018-01-25 12:14:43 -08:00
ASP.NET CI cac1debce9 Updating submodule(s) 
Templating => b0bb198043
WebHooks => 1841f682ed0dda534be74b44402e87ac691a9495

[auto-updated: submodules]
 2018-01-25 20:06:02 +00:00
Pranav K b0bb198043 Merge remote-tracking branch 'origin/release/2.1' into dev 2018-01-25 11:51:32 -08:00
Pranav K 222e3ccbb9
Merge release/2.0 to release/2.1 2018-01-25 11:50:31 -08:00
ASP.NET CI 4b7bb9a2c0 Updating submodule(s) 
Mvc => b30020a655
Proxy => c2fd01b902c4bc52f48e148a09f63ac20fb75c09
SignalR => 96a3a03de8

[auto-updated: submodules]
 2018-01-25 11:47:20 -08:00
ASP.NET CI b4e9fa6434 Updating submodule(s) 
HttpClientFactory => 4d976f65444766ac838b2c10be9b37024421f430
Mvc => 5f2f65e903
SignalR => 95d8ec8fdc
WebHooks => a8667db1855de1c0b62a8c0cea04faddc3681cdb

[auto-updated: submodules]
 2018-01-25 11:15:23 -08:00
Pranav K a6eb93cfdd Merge branch 'release/2.0' into release/2.1 
# Conflicts:
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/AccessDenied.cshtml
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/Manage/EnableAuthenticator.cshtml
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/ManageController.cs
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Models/ManageViewModels/EnableAuthenticatorViewModel.cs
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Models/ManageViewModels/ShowRecoveryCodesViewModel.cs
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Manage/EnableAuthenticator.cshtml
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Manage/GenerateRecoveryCodes.cshtml
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Manage/TwoFactorAuthentication.cshtml
 2018-01-25 11:12:48 -08:00
Pranav K 5f2f65e903
Merge pull request #7301 from aspnet/release/2.1 
PartialTagHelper should not fallback to the current page's model if a…
 2018-01-25 11:07:23 -08:00
Pranav K b30020a655 PartialTagHelper should not fallback to the current page's model if asp-for expression exists 
Fixes #7295
 2018-01-25 11:06:40 -08:00
Pranav K 124525b428 Merge remote-tracking branch 'origin/release/2.1' into dev 2018-01-25 11:03:00 -08:00
Pranav K bc48de9c2f Merge branch 'release/2.1' into dev 2018-01-25 10:54:38 -08:00
Doug Bunting 6162476e0a Add aspnet/WebHooks to Universe 2018-01-25 10:46:13 -08:00
BrennanConroy 95d8ec8fdc
Merge pull request #1353 from aspnet/release/2.1 
Fix incorrect content-type (#1347)
 2018-01-25 10:39:58 -08:00
BrennanConroy 96a3a03de8
Fix incorrect content-type (#1347) 2018-01-25 10:38:27 -08:00
Pranav K a74ef9dfd9 Error message for [ApiController] without attribute route needs to be better 
Fixes #7277
 2018-01-25 10:25:52 -08:00
Andrew Stanton-Nurse 4ac87794c3
Merge pull request #1352 from aspnet/release/2.1 
Enable 'release/' branches on Travis and AppVeyor (#1349)
 2018-01-25 10:18:43 -08:00
Andrew Stanton-Nurse 215123819a
Enable 'release/' branches on Travis and AppVeyor (#1349) 2018-01-25 10:18:03 -08:00
ASP.NET CI bf6cbad2c9 Updating submodule(s) 
DotNetTools => f86bad971a
EntityFrameworkCore => 9c02f1fe9a87c25d45b7131e92c385c5f6563a18
Identity => 284dded983
KestrelHttpServer => e3b70db278
Mvc => f71cbd39b5
Razor => bc6d726c36
Templating => b05532e4e9
WebSockets => 48b951661a

[auto-updated: submodules]
 2018-01-25 09:51:47 -08:00
Ryan Brandenburg f71cbd39b5 Update to Preview2 2018-01-25 09:40:20 -08:00
Ryan Brandenburg f86bad971a Preview2 2018-01-25 09:38:20 -08:00
Ryan Brandenburg 48b951661a Preview2 2018-01-25 09:37:52 -08:00
Ryan Brandenburg b05532e4e9 Preview2 2018-01-25 09:37:19 -08:00
Ryan Brandenburg bc6d726c36 Preview2 2018-01-25 09:37:00 -08:00
Ryan Brandenburg e3b70db278 Preview2 2018-01-25 09:36:03 -08:00
Ryan Brandenburg 284dded983 Preview2 2018-01-25 09:30:36 -08:00
N. Taylor Mullen a01fa1c5b6 Flow RazorLanguageVersion to RazorEngine. 
- Restructured RazorLanguageVersion to be a sealed concrete type to enable things like `RazorLanguageVersion.Latest`; it also allows us to make broader changes in the future. Also, in the future if we want to add support for overriding operators to enable greater than comparisons we can as well.
- Removed version validity checks because we restrict who can construct a `RazorLanguageVersion` now. This way we don't have to check for valid versions all throughout our code.
- Added a simple `ProjectExtensibilityConfiguration` => `RazorLanguageVersion` method in the `DefaultProjectExtensibilityConfigurationFactory` to temporarily enable letting the system operate on the `RazorLanguageVersion`. Eventually that entire class will change.

#1961
 2018-01-25 09:17:37 -08:00
ASP.NET CI c16fabbeb1 Updating submodule(s) 
EntityFrameworkCore => c8363f5fc98081ccc892aefd0d4b5a0569ef597c

[auto-updated: submodules]
 2018-01-25 09:07:24 -08:00
ASP.NET CI d5b78c0fa5 Updating submodule(s) 
EntityFrameworkCore => d32379241d6d57b5d1721baf68e1495c939fb84b

[auto-updated: submodules]
 2018-01-25 09:05:39 -08:00
ASP.NET CI 87feb01bdd Updating BuildTools from 2.1.0-preview1-15671 to 2.1.0-preview2-15683 
[auto-updated: buildtools]
 2018-01-24 18:53:55 -08:00
ASP.NET CI 4aad2648f2 Updating submodule(s) 
DotNetTools => af8d61395f
Identity => d195866baa
Templating => d978b0da6c

[auto-updated: submodules]
 2018-01-24 18:53:36 -08:00
Pranav K 558554de6e
Merge pull request #17 from aspnet/release/2.0 
Pick up templating changes
 2018-01-24 18:50:46 -08:00
ASP.NET CI c408b00486 Updating BuildTools from 2.1.0-preview1-15681 to 2.1.0-preview2-15683 
[auto-updated: buildtools]
 2018-01-25 02:33:19 +00:00
ASP.NET CI 8e94727686 Updating submodule(s) 
JavaScriptServices => 08c2f231ea
KestrelHttpServer => 30a68dec49

[auto-updated: submodules]
 2018-01-25 02:33:02 +00:00
Pranav K 76cc53c2be Pick up templating changes 2018-01-24 17:59:35 -08:00
Steve Sanderson 08c2f231ea Bump aspnet-webpack version to 2.0.2. Also, further minor tweak to TypeScript annotations. 2018-01-24 17:49:51 -08:00
ASP.NET CI fc637008f6 Updating BuildTools from 2.1.0-preview1-15671 to 2.1.0-preview1-15681 
[auto-updated: buildtools]
 2018-01-25 01:47:57 +00:00
ASP.NET CI 89da3f5f53 Updating submodule(s) 
DotNetTools => 77bf031dad
Identity => 561f9ef5ec
IISIntegration => 06348dded7
JavaScriptServices => 5f6f288056
Templating => 382a762a08

[auto-updated: submodules]
 2018-01-25 01:47:39 +00:00
Steve Sanderson 6274733565 TypeScript annotation fixes 2018-01-24 17:44:47 -08:00
Stephen Halter 30a68dec49
Fix flakiness in address-in-use test (#2267) 
* Increase test timeouts
* Use constant for default test timeout.
 2018-01-24 17:42:49 -08:00
waterfoul 5f6f288056 Added support for Thenables 2018-01-24 17:26:38 -08:00
Nate McMaster 77bf031dad Merge branch 'release/2.1' into dev 2018-01-24 17:19:58 -08:00
Jass Bagga 382a762a08
Revert "Update jQuery" (#259) 2018-01-24 17:18:33 -08:00
Justin Kotalik 06348dded7
Change request timeout validation to 1 second. (#546) 2018-01-24 17:18:23 -08:00
Jass Bagga d978b0da6c
Revert "Update jQuery" (#257) 
This reverts commit 78f4c7342b.
 2018-01-24 17:17:57 -08:00
Jass Bagga 561f9ef5ec
Revert "Update jquery" (#1593) 2018-01-24 17:17:33 -08:00