Commit Graph

212 Commits

Author SHA1 Message Date
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
Javier Calvarro Nelson d159cb9b00 Add application DbContext 2018-01-22 13:24:54 -08:00
Jass Bagga a177c557c5
[2.0.x PATCH] Add app.config to net 4.x templates (#231)
Addresses #170
2018-01-18 18:19:18 -08:00
Nate McMaster c786c029f4 Bump version, update build tools, and dependency versions 2018-01-18 16:30:43 -08:00
Jass Bagga 767a857635
Set CompatibilityVersion for templates (#240)
Addresses #235
2018-01-18 16:11:09 -08:00
Nate McMaster 67fab2fec6 Bump version to 2.0.6 and update build tools 2018-01-18 15:42:49 -08:00
Jass Bagga 785424eeaf Rename to .travis.yml 2018-01-18 14:04:28 -08:00
Jass Bagga 0bfe043f6d
Add yaml files (#241) 2018-01-18 13:59:09 -08:00
Hao Kung 5d2f598c80 Update initial migrations 2018-01-16 14:44:29 -08:00
Chris Ross (ASP.NET) eabde9fe9e Add CookiePolicy and consent UI 2018-01-09 12:42:07 -08:00
Jass Bagga 8ebe0a2d29
Derive Web API templates from ControllerBase (#220)
Addresses #45
2018-01-08 15:08:43 -08:00
ASP.NET CI c50e9e90f0 Update dependencies.props
[auto-updated: dependencies]
2018-01-06 15:41:25 -08:00
Jass Bagga da3a49a9b0
Add HttpsPort settings to Empty F# template (#219) 2018-01-05 11:08:47 -08:00
Phillip Carter 5b34474502 Update F# templates (#190) 2018-01-04 10:56:54 -08:00
Steve Sanderson 22da82ff8a Sync remaining Angular-CSharp changes from OOB release into dev branch 2018-01-04 11:10:35 +00:00
Steve Sanderson 0d9f17211f Fix @angular/platform-server version in package-lock.json 2018-01-04 11:01:28 +00:00
Steve Sanderson c637130f88 In React and ReactRedux templates, switch from npm-shrinkwrap.json to package-lock.json 2018-01-04 11:01:19 +00:00
Steve Sanderson 27878265bc Update Angular template to Angular CLI 1.6.3, plus switch it from npm-shrinkwrap.json to package-lock.json 2018-01-04 11:01:01 +00:00
Scott Addie 323453129d Remove yarn.lock file entry from .gitignore files 2018-01-02 16:16:47 +00:00