Commit Graph

345 Commits

Author SHA1 Message Date
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
Jass Bagga ddac0f227e
Revert "Clean up test (#380)" (#381)
This reverts commit ffae7fff84.
2018-03-19 16:11:00 -07:00
Jass Bagga ffae7fff84
Clean up test (#380) 2018-03-19 16:09:35 -07:00
Jass Bagga f036a26988
Merge pull request #379 from aspnet/release/2.1
Fix BOM test paths for Unix (#377)
2018-03-19 16:07:10 -07:00
Jass Bagga 6444acedfd
Fix BOM test paths for Unix (#377) 2018-03-19 16:05:49 -07:00
Jass Bagga 0b58328143
Merge pull request #372 from aspnet/release/2.1
Remove BOM from json files (#369)
2018-03-19 10:11:28 -07:00
Jass Bagga 79b4cafe68
Remove BOM from json files (#369)
Addresses #276
2018-03-19 10:11:00 -07:00
Pranav K b96c8ca3fe
Merge branch 'release/2.1' into dev 2018-03-16 12:34:42 -07:00
Pranav K feaf8168b1
Update KoreBuild channel 2018-03-16 12:34:38 -07:00
Pranav K 3d5573aeed
Update version prefix to preview3 2018-03-16 11:28:40 -07:00
Pranav K 741a22daae
Merge remote-tracking branch 'origin/release/2.1' into dev 2018-03-16 11:28:40 -07:00
Pranav K a8ed6e458d
Branching for 2.1.0-preview2 2018-03-16 11:17:31 -07:00
Jass Bagga 5f149cfa9c
Skip F# net framework test (#363) 2018-03-15 15:56:16 -07:00
Jass Bagga d201aa31cc
Update dependencies (#359) 2018-03-15 10:47:49 -07:00
Hao Kung 7db6925ffc
Split sqllite and sql server migrations (#348)
* Split sqllite and sql server migrations

* Fix casing, move files around

* Remove if defs and add check
2018-03-13 11:41:16 -07:00
Jass Bagga dbc5e38d04
Match launchSettings variable to sourceName in template.json (#354)
Addresses #346
2018-03-13 09:52:20 -07:00
Scott Addie 0879dbd082 Convert ValuesController return types to ActionResult<T> (#351)
Addresses #339
2018-03-13 09:50:39 -07:00
Scott Addie 12c3cf028c Assign language and template type to 3 C# item templates (#343)
Addresses #341
2018-03-12 11:22:07 -07:00
Jass Bagga 6ca89b2ff1
Update dependencies (#352) 2018-03-12 11:06:09 -07:00
Hao Kung d682c971b7
Add test for ensuring that migration is current (#344) 2018-03-08 12:12:13 -08:00
Pranav K bae1156511
Prepend FeatureBranchVersionPrefix if FeatureBranchVersionSuffix is specified 2018-03-06 10:06:31 -08:00
Pranav K ac81f2bb35
Use dotnet-core feed in repos 2018-03-06 10:06:31 -08:00
ASP.NET CI 61fd3ae7ea Update dependencies.props
[auto-updated: dependencies]
2018-03-04 12:31:30 -08:00
Jass Bagga c4d1f20c78
Remove bundleconfig.json files from project templates (#335)
Addresses #326
2018-03-01 11:58:18 -08:00
ASP.NET CI 3267789666 Update dependencies.props
[auto-updated: dependencies]
2018-02-26 11:18:39 -08:00
Jass Bagga 8cac91b15e
Update jQuery (#307) 2018-02-22 14:39:18 -08:00
Pranav K 56e2dbebf2 Use FeatureBranchVersionSuffix when generating VersionSuffix 2018-02-21 18:27:17 -08:00
Steve Sanderson 7debea272c Update Angular template content to match @angular/cli@1.7.0 2018-02-21 13:56:19 +00:00
ASP.NET CI 74c5c05a2e Update dependencies.props
[auto-updated: dependencies]
2018-02-18 12:34:43 -08:00
Nate McMaster 456121af8b
Fix #320 - skip the certificate error page in Edge 2018-02-12 15:42:51 -08:00
ASP.NET CI 4f9b7c611a Update dependencies.props
[auto-updated: dependencies]
2018-02-11 12:45:08 -08:00