浏览代码

Merge pull request #911 from mickeypuri/visualstudio

fixed handling of nuget packages
Adam Roben 11 年之前
父节点
当前提交
5244c6152f
共有 1 个文件被更改,包括 5 次插入4 次删除
  1. 5 4
      VisualStudio.gitignore

+ 5 - 4
VisualStudio.gitignore

@@ -16,9 +16,6 @@ bld/
 [Bb]in/
 [Oo]bj/
 
-# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
-!packages/*/build/
-
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
@@ -119,10 +116,14 @@ publish/
 
 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
+#packages/*
 ## TODO: If the tool you use requires repositories.config, also uncomment the next line
 #!packages/repositories.config
 
+# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+# This line needs to be after the ignore of the build folder (and the packages folder if the line above has been uncommented)
+!packages/build/
+
 # Windows Azure Build Output
 csx/
 *.build.csdef