push origin masterMerge branch 'paschott-master'

Author: uc-msft

.gitignore

@@ -1,7 +1,5 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
 *.suo
@@ -19,10 +17,10 @@
 [Rr]eleases/
 x64/
 x86/
+build/
 bld/
 [Bb]in/
 [Oo]bj/
-[Ll]og/
 
 # Visual Studio 2015 cache/options directory
 .vs/
@@ -50,6 +48,9 @@ project.lock.json
 project.fragment.lock.json
 artifacts/
 **/Properties/launchSettings.json
+# DNX
+project.lock.json
+artifacts/
 
 *_i.c
 *_p.c
@@ -89,6 +90,9 @@ ipch/
 *.cachefile
 *.VC.db
 *.VC.VC.opendb
+*.opensdf
+*.sdf
+*.cachefile
 
 # Visual Studio profiler
 *.psess
@@ -153,47 +157,30 @@ DocProject/Help/Html2
 DocProject/Help/html
 
 # Click-Once directory
-#publish/
+# publish/
 
 # Publish Web Output
-#*.[Pp]ublish.xml
 *.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
+# TODO: Comment the next line if you want to checkin your web deploy settings 
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
 
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
+**/packages/*
 # except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
+!**/packages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
+#!**/packages/repositories.config
 
-# Microsoft Azure Build Output
+# Windows Azure Build Output
 csx/
 *.build.csdef
 
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
+# Windows Store app package directory
 AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -203,6 +190,7 @@ _pkginfo.txt
 
 # Others
 ClientBin/
+[Ss]tyle[Cc]op.*
 ~$*
 *~
 *.dbmdl
@@ -216,6 +204,11 @@ orleans.codegen.cs
 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
 #bower_components/
 
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
 # RIA/Silverlight projects
 Generated_Code/
 
@@ -249,6 +242,8 @@ node_modules/
 
 # Typescript v1 declaration files
 typings/
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
 
 # Visual Studio 6 build log
 *.plg
@@ -304,6 +299,61 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
+/build
+/Build
+/deploy
+/package
+bin/
+obj/
+sql/
+*/obj/debug
+**/Debug
+#ignore thumbnails created by windows
+Thumbs.db
+#Ignore files build by Visual Studio
+*.obj
+*.pdb
+*.user
+*.aps
+*.pch
+*.docstates
+*.vspscc
+*_i.c
+*_p.c
+*.ncb
+*.suo
+*.tlb
+*.dbmdl
+*.schemaview
+*.tlh
+*.cache
+*.ilk
+*.log
+[Bb]in
+[Dd]ebug*/
+*.lib
+*.sbr
+obj/
+[Rr]elease*/
+_ReSharper*/
+[Tt]est[Rr]esult*
+*.docstates
+*.swp
+*.*~
+*.gpState
+*.ReSharper*
+*.preflight
+*.nocommit
+#Ignore Recovery Files made by Excel
+~$*.xlsx
+*.rdl.data
+
+*.jfm
+
+#======================================================================================
+# The below section could possibly be removed as these should be ignored by the above.
+#======================================================================================
+
 samples/in-memory/ticket-reservations/DemoWorkload/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
 *.nupkg
 samples/in-memory/ticket-reservations/packages/CircularGauge.1.0.0/CreatePackageFile.bat