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

230 Commits

Author SHA1 Message Date
Jass Bagga acc2147ac5
Merge pull request #315 from aspnet/release/2.1 
Remove hard coded copyright year
 2018-02-07 14:28:39 -08:00
Jass Bagga 5ed4e6e3f7
Remove hard coded copyright year 2018-02-07 14:27:50 -08:00
Jass Bagga 6b490836b1 Remove hard coded copyright year 2018-02-07 14:13:02 -08:00
Ryan Brandenburg 2d6d29270b Revert "Skip flaky tests" 
This reverts commit cff1d46ac9.
 2018-02-05 11:11:53 -08:00
Jass Bagga b177f5a145
Merge pull request #304 from aspnet/release/2.1 
Remove F# web app VS host file
 2018-02-05 10:42:02 -08:00
Jass Bagga fe3e420e0e
Remove F# VS host file (#303) 2018-02-05 10:30:14 -08:00
Jass Bagga cc14da18eb Remove F# web app hosts file 2018-02-05 10:14:14 -08:00
Javier Calvarro Nelson 9655e7d9fa Update dependencies 2018-02-03 13:56:52 -08:00
Eilon Lipton 062f6b4d31
Merge pull request #284 from peterblazejewicz/fix/279 
Add empty TypeScript starter template file. Closes #279
 2018-02-02 16:35:37 -08:00
Eilon Lipton 087a81ab28
Merge pull request #291 from peterblazejewicz/feat/280 
Update project .gitignore. Closes #280
 2018-02-02 16:34:25 -08:00
Javier Calvarro Nelson ef2cd819f4 Merge branch 'release/2.1' into dev 2018-02-02 16:13:38 -08:00
Javier Calvarro Nelson 216e9f62c4 Fix kestrel urls in launchSettings.json 2018-02-02 16:10:15 -08:00
Javier Calvarro Nelson a4427f5263 Fix kestrel urls in launchSettings.json 2018-02-02 16:07:02 -08:00
Ryan Brandenburg cff1d46ac9 Skip flaky tests 2018-02-02 13:48:49 -08:00
Peter Blazejewicz fd62b194ca Update project .gitignore. Closes #280 
Just project file with support for IDEA/Rider

Thanks!
 2018-02-02 22:27:44 +01:00
Jass Bagga 66750bb20a
Merge pull request #285 from aspnet/release/2.1 
Adding host configurations for F# templates (#281)
 2018-02-02 12:19:37 -08:00
Jonathon Marolf 8079ab8b58 Adding host configurations for F# templates (#281) 2018-02-02 12:18:50 -08:00
Peter Blazejewicz ebeb7b93f9 Add empty TypeScript starter template file. Closes #279 
No content, the header with the same CTA as in site.js

And no BOM, there is no policy to enforce it in the repo.

Thanks!
 2018-02-02 21:14:20 +01:00
Javier Calvarro Nelson fe3d4f0d8b Merge branch 'release/2.1' into dev 2018-02-02 10:33:03 -08:00
Javier Calvarro Nelson 1ea32bd569
[Fixes #283] Updates vs-2017.3.host.json to include the HTTP port 2018-02-02 10:32:19 -08:00
John Luo bd9e53015d Merge branch 'release/2.1' into dev 2018-02-01 14:48:34 -08:00
John Luo 94cfac8ec6 Use Microsoft.AspNetCore.App in templates 
- Add BrowserLink and Sqlite for Razor and StarterWeb templates when required
- Add tests for LocalDB scenarios
 2018-02-01 12:52:05 -08:00
Nate McMaster 7e43fae45d Update dependencies.props to 2.1.0-preview-28193, build tools to 2.1.0-preview1-1010 [ci skip] 
Scripted changes:
- updated travis and appveyor.yml files to only build dev, ci, and release branches
- updated dependencies.props
- updated korebuild-lock.txt
- updated korebuild.json to release/2.1 channel
 2018-01-31 15:01:13 -08:00
Jass Bagga ba0abd2285
Add missing bootstrap and js min files to RazorPages template (#269) 
Addresses #217
 2018-01-30 14:09:03 -08:00
Jass Bagga e8816350ef
Add namespace for SignedOut.cshtml.cs (#266) 
Addresses #205
 2018-01-29 14:03:14 -08:00
Chris Ross f15637e328
Update README.md with build instructions (#211) 2018-01-29 09:37:31 -08:00
Jass Bagga eaa6044cb9
Merge pull request #265 from aspnet/release/2.1 
Merge branch release/2.1 into dev
 2018-01-26 16:25:28 -08:00
Jass Bagga ec90252b85
Merge pull request #264 from aspnet/jbagga/LaunchSettings263 
Addresses #263
 2018-01-26 16:19:27 -08:00
Jass Bagga c15cd757cf Set ASPNETCORE_URLS 2018-01-26 15:59:54 -08:00
Nate McMaster e3b23a9fd8 Merge branch 'release/2.1' into dev 2018-01-25 12:27:21 -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
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
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
Ryan Brandenburg b05532e4e9 Preview2 2018-01-25 09:37:19 -08:00
Jass Bagga 382a762a08
Revert "Update jQuery" (#259) 2018-01-24 17:18:33 -08:00
Jass Bagga d978b0da6c
Revert "Update jQuery" (#257) 
This reverts commit 78f4c7342b.
 2018-01-24 17:17:57 -08:00
Steve Sanderson 2898129c92 Merge branch 'release/2.1' into dev 2018-01-24 15:16:16 -08:00
Jass Bagga 1669e39735
Add firewall exclusions for test executables (#244) 2018-01-24 15:11:28 -08:00
Steve Sanderson b1ccc31ccf Update SPA template identifiers to end with ".2.1". Fixes #230 2018-01-24 23:02:22 +00:00
Javier Calvarro Nelson 1e0bde0345 Update dependencies 2018-01-24 13:56:07 -08:00
Javier Calvarro Nelson 6ab9e94703 Upgrade dependencies 2018-01-23 21:14:03 -08:00
Javier Calvarro Nelson d3c8231ed3 Merge branch 'release/2.1' into dev 2018-01-23 17:41:36 -08:00
Javier Calvarro Nelson 2269a31983 [Fixes #245] Update Identity to use the default layout from the application. 
Added /Areas/Identity/Pages/_ViewStart.cshtml and set the layout to the
applications layout.
 2018-01-23 17:40:57 -08:00
Jass Bagga eea0048d58
Merge pull request #253 from aspnet/release/2.1 
Update jQuery (#250)
 2018-01-23 16:14:29 -08:00
Jass Bagga 78f4c7342b
Update jQuery (#250) 
Addresses #248
 2018-01-23 16:11:41 -08:00
Pranav K 6c0820fe1f Merge branch 'release/2.1' into dev 2018-01-23 15:51:31 -08:00
Pranav K e8d3e2f2bd Branching for 2.1.0-preview1 2018-01-23 15:33:13 -08:00