Commit Graph

1011 Commits (d2c49844a78d5e6dd9a5e685cbd434591556aeec)

Author SHA1 Message Date
danroth27 8bbc10a6ea Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-11-07 12:21:34 -08:00
John Rowley 16a0035918 Updated understanding-aspnet5-apps to use the up to date configuration
I changed
* config.get to config[]
* new Configuration() with ConfigurationBuilder and its' process.
* services.AddSingleton to services.AddInstance
2015-11-07 12:16:30 -08:00
danroth27 130d88078d Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-11-07 12:09:42 -08:00
John Rowley 91d7b2a4b1 Updated "Get Started with Entity Framework 7 using ASP.NET MVC 6" tutorial to beta8 2015-11-07 12:06:09 -08:00
danroth27 9a75e7ef0f Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-11-05 16:59:08 -08:00
danroth27 7d3c7aa4fc Emphasize app insights package 2015-11-05 16:57:50 -08:00
John Rowley 6d4e10eeb7 Fixed an indentation error where some code was cut off in an
example.
2015-11-05 16:54:14 -08:00
danroth27 c9afb7d0a7 Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-11-05 16:45:20 -08:00
Scott Addie 6d4052fe04 Update 'Building Projects with Yeoman' article 2015-11-05 16:43:05 -08:00
danroth27 fb3dadeffd Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-11-05 16:34:22 -08:00
Andrii Tsok 2cedc484a4 Fixed example implementation of Configure method.
Corrected the example with a fully defined method's code. 
Added additional 24-26 lines to example code for providing consistent code fragment.
2015-11-05 16:33:10 -08:00
danroth27 52e6ed19d4 Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-11-05 16:20:23 -08:00
Scott Addie 7b54f825a5 Replace config.json references with appsettings.json 2015-11-05 16:19:18 -08:00
danroth27 027e72e92e Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-11-05 16:08:02 -08:00
Max Malook e32a0c1278 Pluralize class names by using separate words 2015-11-05 16:06:26 -08:00
danroth27 a9b9b810a0 Merge branch '1.0.0-beta8' 2015-11-05 15:52:47 -08:00
danroth27 9c429b39bd Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-11-05 15:37:27 -08:00
Matthew Cantelon d19b11c6b1 Update Docker installation instructions 2015-11-05 15:35:41 -08:00
Steve Smith 97ba43c596 Merge pull request #609 from scottforsyth/scottforsyth-patch-1
Highlighted new using statement
2015-11-05 10:51:00 -08:00
scottforsyth 2e6567124e Highlighted new using statement 2015-11-05 10:46:09 -08:00
danroth27 5317f97384 Merge branch 'patch-1' 2015-10-29 10:32:01 -07:00
danroth27 2d5dfafdb4 Merge branch 'patch-1' into 1.0.0-rc1 2015-10-29 10:31:30 -07:00
Max Malook b2e6cc6b6b Update static-files.rst 2015-10-29 10:29:06 -07:00
Rick Anderson 3ccec8dc06 Merge branch 'master' of https://github.com/aspnet/Docs 2015-10-28 17:55:46 -07:00
danroth27 d1c1bd1d1e Merge branch 'patch-1' 2015-10-28 12:16:13 -07:00
danroth27 4e6032db69 Merge branch 'patch-1' into 1.0.0-rc1 2015-10-28 12:15:53 -07:00
Henning Støverud bce436c8d9 Default name changed from config.json to appsettings.json
In beta 8 the name of the genrated config file has changed from config.json to appsettings.json.
2015-10-28 12:14:57 -07:00
danroth27 34edb9b128 Merge branch 'bower-article-update' 2015-10-28 11:50:10 -07:00
danroth27 bb825088b4 Merge branch 'bower-article-update' into 1.0.0-rc1 2015-10-28 11:49:50 -07:00
danroth27 e480c28191 Add Scott Addie to authors list 2015-10-28 11:22:39 -07:00
Scott Addie e48e260e19 Update Bower article for Beta 8 release 2015-10-28 11:17:57 -07:00
danroth27 5f1b40c187 Merge branch 'erikre102015-asp5' 2015-10-28 11:01:46 -07:00
danroth27 70fc9610fe Merge branch 'erikre102015-asp5' into 1.0.0-rc1 2015-10-28 11:01:22 -07:00
Erik Reitan 95f38b92c4 Adding survey link to top-level index page. 2015-10-28 10:58:28 -07:00
danroth27 bcca492fd3 Merge branch 'fixformatting' 2015-10-28 00:21:09 -07:00
danroth27 7bf732b54e Merge branch 'fixformatting' into 1.0.0-rc1 2015-10-28 00:20:50 -07:00
danroth27 48ffc07fde Fix literal block 2015-10-28 00:20:18 -07:00
danroth27 cd537e4e15 Fix merge conflict 2015-10-28 00:12:09 -07:00
danroth27 acf53692a8 Merge branch 'riande-pubISS-installOnWin' into 1.0.0-rc1 2015-10-28 00:06:53 -07:00
danroth27 938cdaeefb Minor formatting fixes 2015-10-27 23:59:46 -07:00
Rick Anderson e40180f316 organize directions 2015-10-27 23:59:45 -07:00
Daniel Roth 839557631f Fix broken image link 2015-10-26 13:19:38 -07:00
Rick Anderson e74f46f850 IIS Pub B8
feedback fixes

fixes II

copy edits
2015-10-22 11:49:30 -07:00
Rick Anderson 71f45fda01 IIS Pub B8
feedback fixes

fixes II

copy edits
2015-10-22 11:38:27 -07:00
Rick Anderson 12fd45f3ad IIS Pub B8
feedback fixes

fixes II

copy edits
2015-10-22 10:29:27 -07:00
danroth27 3a48b31baf Merge branch 'hidehelpfulness' 2015-10-21 07:02:36 -07:00
danroth27 bc791df52c Merge branch 'hidehelpfulness' into 1.0.0-rc1 2015-10-21 07:02:14 -07:00
danroth27 72162c24c6 Remove helpfulness script temporarily 2015-10-21 06:55:05 -07:00
danroth27 5465e29507 Merge branch 'fixhelpfulness' 2015-10-21 00:31:17 -07:00
danroth27 9e99f1034a Merge branch 'fixhelpfulness' into 1.0.0-rc1 2015-10-21 00:30:59 -07:00