Commit Graph

425 Commits

Author SHA1 Message Date
Jass Bagga 56fc40dbca
Revert "Revert "Update jquery-validation-unobtrusive (#421)"" (#426)
This reverts commit e6112a0911.
2018-04-01 23:29:52 -07:00
Pavel Krymets 23b9290deb
Merge pull request #425 from aspnet/revert-421-jbagga/UpdatejQueryLibraries
Revert "Update jquery-validation-unobtrusive"
2018-03-31 16:24:56 -07:00
Pavel Krymets a76d51c46b Revert "Update jquery-validation-unobtrusive (#421)"
This reverts commit ac9addabcc.
2018-03-31 16:24:07 -07:00
Pavel Krymets 31995a380b
Merge pull request #424 from aspnet/revert-423-release/2.1
Revert "Update jquery-validation-unobtrusive (#421)"
2018-03-31 16:13:06 -07:00
Pavel Krymets e6112a0911
Revert "Update jquery-validation-unobtrusive (#421)" 2018-03-31 16:09:27 -07:00
Jass Bagga 02cd8fe36b
Merge pull request #423 from aspnet/release/2.1
Update jquery-validation-unobtrusive (#421)
2018-03-30 15:05:20 -07:00
Jass Bagga ac9addabcc
Update jquery-validation-unobtrusive (#421)
Addresses #15
2018-03-30 15:04:50 -07:00
Jass Bagga c0c28fb9f1 Merge branch 'release/2.1' into dev 2018-03-29 14:40:40 -07:00
Jass Bagga 2f9ce959ea
Target net461 for all tests (#420) 2018-03-29 14:38:47 -07:00
Jass Bagga cf135a2e03 Merge branch 'release/2.1' into dev 2018-03-29 14:11:05 -07:00
Pranav K effdc47246
Update dependencies.props 2018-03-29 14:07:02 -07:00
Jass Bagga cb7942abe4
Add no-https option for all templates (#413)
Addresses #322
2018-03-29 13:59:47 -07:00
Jass Bagga 79cc52d903
Merge pull request #418 from aspnet/release/2.1
--no-https option for RazorPagesWeb-CSharp template (#362)
2018-03-29 13:49:46 -07:00
Jass Bagga aca30fe8a2
--no-https option for RazorPagesWeb-CSharp template (#362) 2018-03-29 13:49:20 -07:00
Pranav K f166d0b8a8
Merge remote-tracking branch 'origin/release/2.1' into dev
# Conflicts:
#	build/dependencies.props
#	korebuild-lock.txt
2018-03-29 12:23:18 -07:00
Pranav K 5ae68a012c Re-enable F# template tests
Fixes https://github.com/aspnet/templating/issues/365
2018-03-29 12:21:35 -07:00
Nate McMaster (automated) 63f4a7d124
Update dependencies.props
[auto-updated: dependencies]
2018-03-28 11:08:04 -07:00
Chris Ross (ASP.NET) fc1e40e6d1 Merge branch 'release/2.1' into dev 2018-03-27 12:21:31 -07:00
Chris Ross (ASP.NET) f25f411b68 Add HostFiltering configuration to templates 2018-03-27 12:13:24 -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
Javier Calvarro Nelson 9336ee1b74 Merge branch 'release/2.1' into dev 2018-03-26 21:01:32 -07:00
Javier Calvarro Nelson a8246e2a99 [Fixes #327] Replace AAD template code with packages
* Add Microsoft.AspNetCore.Authentication.AzureAD.UI package.
* Add Microsoft.AspNetCore.Authentication.AzureADB2C.UI package.
* Remove AccountController.
* Remove Pages/Views related to authentication.
2018-03-26 20:37:46 -07:00
Hao Kung 7388b09b23 Merge remote-tracking branch 'origin/release/2.1' into dev 2018-03-26 12:19:52 -07:00
Hao Kung e1cb3f25ac Switch to AddDefaultIdentity 2018-03-26 12:18:01 -07:00
ASP.NET CI f64aae0f41 Update dependencies.props
[auto-updated: dependencies]
2018-03-25 15:57:55 -07:00
Jass Bagga 83966930d3
Skip WebApiTemplate_Works_NetCore test temporarily (#401) (#403) 2018-03-24 17:45:51 -07:00
Jass Bagga 1fe30aabbe
Skip WebApiTemplate_Works_NetCore test temporarily (#401) 2018-03-24 17:45:24 -07:00
John Luo b449373a5f Merge branch 'release/2.1' into dev 2018-03-23 12:10:17 -07:00
John Luo e3894a4609 Remove EF.Tools reference 2018-03-23 12:09:46 -07:00
Jass Bagga c8f8d722f3
Merge pull request #398 from aspnet/release/2.1
Set userBrowserLink to false for VS host file (#395)
2018-03-22 17:04:28 -07:00
Jass Bagga 4acda9dd9b
Set userBrowserLink to false for VS host file (#395)
Addresses #394
2018-03-22 17:04:09 -07:00
Jass Bagga d2befa48e7
Merge pull request #393 from aspnet/release/2.1
Use applicationUrl instead of ASPNETCORE_URLS (#390)
2018-03-22 10:32:53 -07:00
Jass Bagga b24e3b2e78
Use applicationUrl instead of ASPNETCORE_URLS (#390)
Addresses #328
2018-03-22 10:32:20 -07:00
Nate McMaster c09ce816de
Merge branch 'release/2.1' into dev 2018-03-21 18:51:12 -07:00
Nate McMaster 899a298534
Fix package metadata to match default settings for aspnetcore (#389) 2018-03-21 18:10:31 -07:00
Jass Bagga 1d00bb449f
Merge pull request #387 from aspnet/release/2.1
Move layout and partial script to Shared dir (#368)
2018-03-20 15:18:13 -07:00
Jass Bagga 586c4ff780
Move layout and partial script to Shared dir (#368)
Addresses #340
2018-03-20 15:17:50 -07:00
Kiran Challa 88f8f97702 Merge branch 'release/2.1' into dev 2018-03-20 13:47:26 -07:00
Kiran Challa 69f52cc3b6 Removing Microsoft.AspNetCore.SpaTemplates project and friends 2018-03-20 13:46:11 -07:00
Jass Bagga 001f37263b
Merge pull request #385 from aspnet/release/2.1
Use partial tag helper (#375)
2018-03-20 10:36:34 -07:00
Jass Bagga f786df9dc9
Use partial tag helper (#375)
Addresses #338
2018-03-20 10:36:08 -07:00
Hao Kung edaf72c7fc
Add update migrations script (#376) 2018-03-20 09:45:53 -07:00
Jass Bagga 7f00516475
Merge pull request #383 from aspnet/jbagga/merge/release/2.1
Merge release/2.1 to dev
2018-03-19 16:34:21 -07:00
Jass Bagga 88f29c76af Merge branch 'release/2.1' into jbagga/merge/release/2.1
# Conflicts:
#	build/dependencies.props
2018-03-19 16:31:39 -07:00
Jass Bagga cbdc7bd3b8
Remove tools references and explicit EF.Design reference (#370)
Addresses #99 and #357
2018-03-19 16:27:54 -07:00
Kiran Challa 8f2c029a95 Merge branch 'release/2.1' into dev 2018-03-19 16:22:18 -07:00
Jass Bagga ecea1f806d Merge branch 'release/2.1' into dev 2018-03-19 16:17:40 -07:00
Kiran Challa fa8fcc9a62 Made wwwroot 'copyOnly' to avoid modifications in it's files 2018-03-19 16:15:34 -07:00
Jass Bagga 3ee212cef2
Clean up test (#382) 2018-03-19 16:14:20 -07:00