From ec5009e954d78b23dfa52e80e26c8dd25822b9e4 Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 19 Dec 2012 15:28:41 -0800 Subject: [PATCH 1/5] Move VisualStudio file from Global to main list --- Global/VisualStudio.gitignore => VisualStudio.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Global/VisualStudio.gitignore => VisualStudio.gitignore (100%) diff --git a/Global/VisualStudio.gitignore b/VisualStudio.gitignore similarity index 100% rename from Global/VisualStudio.gitignore rename to VisualStudio.gitignore From 947f5d13abd1e35a2ce103e7add12417f4f27b53 Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 19 Dec 2012 15:46:33 -0800 Subject: [PATCH 2/5] Merge missing CSharp/VB settinsg into VisualStudio The VisualStudio gitignore file was missing a few useful settings contained in the CSharp and VB.NET gitignore files. --- VisualStudio.gitignore | 47 +++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 9d4784c8..47e8c38a 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -8,13 +8,15 @@ # Build results -[Dd]ebug*/ +[Dd]ebug/ [Rr]elease/ - +x64/ build/ +[Bb]in/ +[Oo]bj/ - -[Tt]est[Rr]esult +# MSTest test Results +[Tt]est[Rr]esults/ [Bb]uild[Ll]og.* *_i.c @@ -32,14 +34,14 @@ build/ *.tli *.tlh *.tmp +*.log *.vspscc *.vssscc .builds - *.pidb - *.log *.scc + # Visual C++ cache files ipch/ *.aps @@ -50,6 +52,7 @@ ipch/ # Visual Studio profiler *.psess *.vsp +*.vspx # Guidance Automation Toolkit *.gpState @@ -82,9 +85,18 @@ publish # Publish Web Output *.Publish.xml +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +#packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + # Others -[Bb]in -[Oo]bj sql TestResults [Tt]est[Rr]esult* @@ -104,5 +116,20 @@ _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML -# NuGet -packages/ +# 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/ From f06c0504ac984ee44ddc820c609a4e9490ec7d19 Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 19 Dec 2012 15:49:20 -0800 Subject: [PATCH 3/5] Remove CSharp and VB.NET ignore files These files were redundant. They had almost exactly the same settings. They are being replaced by the VisualStudio file. --- CSharp.gitignore | 113 ----------------------------------------------- VB.Net.gitignore | 99 ----------------------------------------- 2 files changed, 212 deletions(-) delete mode 100644 CSharp.gitignore delete mode 100644 VB.Net.gitignore diff --git a/CSharp.gitignore b/CSharp.gitignore deleted file mode 100644 index d82323e2..00000000 --- a/CSharp.gitignore +++ /dev/null @@ -1,113 +0,0 @@ -# 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. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results -[Dd]ebug/ -[Rr]elease/ -x64/ -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.log -*.vspscc -*.vssscc -.builds - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf - -# Visual Studio profiler -*.psess -*.vsp -*.vspx - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper* - -# Mindbench SASS cache -.sass-cache/ - -# NCrunch -*.ncrunch* -.*crunch*.local.xml - -# Installshield output folder -[Ee]xpress - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish - -# Publish Web Output -*.Publish.xml - -# NuGet Packages Directory -packages - -# Windows Azure Build Output -csx -*.build.csdef - -# Windows Store app package directory -AppPackages/ - -# Others -sql -TestResults -[Tt]est[Rr]esult* -*.Cache -ClientBin -[Ss]tyle[Cc]op.* -~$* -*.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 - -# SQL Server files -App_Data/*.mdf -App_Data/*.ldf diff --git a/VB.Net.gitignore b/VB.Net.gitignore deleted file mode 100644 index a5d3ad35..00000000 --- a/VB.Net.gitignore +++ /dev/null @@ -1,99 +0,0 @@ -# Build and Object Folders -bin/ -obj/ - -#User Specific Files -*.user -*.suo - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results -[Dd]ebug/ -[Rr]elease/ -x64/ -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.log -*.vspscc -*.vssscc -.builds - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf - -# Visual Studio profiler -*.psess -*.vsp -*.vspx - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper* - -# NCrunch -*.ncrunch* -.*crunch*.local.xml - -# Installshield output folder -[Ee]xpress - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish - -# Publish Web Output -*.Publish.xml - -# Others -[Bb]in -[Oo]bj -sql -TestResults -[Tt]est[Rr]esult* -*.Cache -ClientBin -[Ss]tyle[Cc]op.* -~$* -*.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 \ No newline at end of file From 79a7a1d9c5c1c389a6eb1de2411c1c2c1ba755d2 Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Tue, 22 Jan 2013 10:30:18 -0800 Subject: [PATCH 4/5] Ignore .pfx files such as Windows Store Key --- VisualStudio.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 47e8c38a..9088e6b2 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -105,8 +105,8 @@ ClientBin [Ss]tyle[Cc]op.* ~$* *.dbmdl - *.[Pp]ublish.xml +*.pfx Generated_Code #added for RIA/Silverlight projects From f5d67199f7c58f9f10af46b05869eb973661deae Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Tue, 22 Jan 2013 10:35:42 -0800 Subject: [PATCH 5/5] Ignore crap from Macs Cross platform .NET Dev FTW! --- VisualStudio.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 9088e6b2..07c4255d 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -133,3 +133,6 @@ Desktop.ini # Recycle Bin used on file shares $RECYCLE.BIN/ + +# Mac crap +.DS_Store