Merge pull request #492 from Haacked/consolidate-dotnet-settings

Consolidate CSharp and VB.NET gitignore files into VisualStudio one.

Author: haacked

Global/VisualStudio.gitignore

@@ -1,10 +1,3 @@
-# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
-[Bb]in/
-[Oo]bj/
-
-# mstest test results
-TestResults
-
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
@@ -14,9 +7,18 @@ TestResults
 *.sln.docstates
 
 # Build results
+
 [Dd]ebug/
 [Rr]elease/
 x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esults/
+[Bb]uild[Ll]og.*
+
 *_i.c
 *_p.c
 *.ilk
@@ -36,6 +38,9 @@ x64/
 *.vspscc
 *.vssscc
 .builds
+*.pidb
+*.log
+*.scc
 
 # Visual C++ cache files
 ipch/
@@ -53,16 +58,15 @@ ipch/
 *.gpState
 
 # ReSharper is a .NET coding add-in
-_ReSharper*
+_ReSharper*/
 
-# Mindbench SASS cache
-.sass-cache/
+*.[Rr]e[Ss]harper
 
 # NCrunch
 *.ncrunch*
 .*crunch*.local.xml
 
-# Installshield output folder 
+# Installshield output folder
 [Ee]xpress
 
 # DocProject is a documentation generator add-in
@@ -82,7 +86,8 @@ publish
 *.Publish.xml
 
 # NuGet Packages Directory
-packages
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
 
 # Windows Azure Build Output
 csx
@@ -100,6 +105,9 @@ ClientBin
 [Ss]tyle[Cc]op.*
 ~$*
 *.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+
 Generated_Code #added for RIA/Silverlight projects
 
 # Backup & report files from converting an old project file to a newer
@@ -111,3 +119,20 @@ UpgradeLog*.XML
 # SQL Server files
 App_Data/*.mdf
 App_Data/*.ldf
+
+# =========================
+# Windows detritus
+# =========================
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store