Merged pull request #135 from mibe/master.

More VisualStudio rules
2011-04-29 02:03:02 -07:00 · 2011-04-29 02:03:02 -07:00 · f6dfb71a9a
parent 4ee2a35005 697559b09c
commit f6dfb71a9a
2 changed files with 6 additions and 7 deletions
--- a/CSharp.gitignore
+++ b/CSharp.gitignore
@ -5,12 +5,5 @@ _ReSharper*
 bin
 obj

-# user settings
-*.user
-*.suo
-
-# if you have pictures, windows will likely create those annoying index files
-Thumbs.db
-
 # mstest test results
 TestResults
--- a/Global/VisualStudio.gitignore
+++ b/Global/VisualStudio.gitignore
@ -64,3 +64,9 @@ stylecop.*
 ~$*
 *.dbmdl
 Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup/
+UpgradeLog.XML