Merge branch 'master' into Github/master

README.md

@@ -8,25 +8,26 @@ It uses the method described here: http://docs.nuget.org/docs/creating-packages/
 HOW TO USE
 ------------
 
-- Add a new project to your solution by using the MSBuild project template (http://visualstudiogallery.msdn.microsoft.com/4b75d0cc-b693-4c1c-8105-fbaeb0714b03)
-- Install nuget package MSBuild.MSBNuget
+- Add a new project to your solution by using the [MSBuild-project-template](http://visualstudiogallery.msdn.microsoft.com/4b75d0cc-b693-4c1c-8105-fbaeb0714b03)
+- Install nuget package [MSBuild.MSBNuget](sdfsf)
 - Open build.props and configure common settings, eg:
 
 ```XML
   <PropertyGroup>
-    <PublishToLocalNugetFeed>true</PublishToLocalNugetFeed>
-    <NugkgPublishFolder>C:\Dev\_galleries\nuget\</NugkgPublishFolder>
-    <NugkgPublishFolder Condition="'$(NugkgPublishFolder)'==''">$(MSBuildProjectDirectory)\..\..\Publish\</NugkgPublishFolder>
-    <NugkgReleaseFolder Condition="'$(NugkgReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgReleaseFolder>
+    <NugetPublishToReleaseFolder Condition="'$(NugetPublishToReleaseFolder)'==''">false</NugetPublishToReleaseFolder>
+    <NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">false</NugetPublishToLocalNugetFeed>
+
+    <NugetPublishLocalNugetFeedFolder Condition="'$(NugetPublishLocalNugetFeedFolder)'==''">$(MSBuildProjectDirectory)\..\..\Publish\</NugetPublishLocalNugetFeedFolder
+    <NugetPublishReleaseFolder Condition="'$(NugetPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugetPublishReleaseFolder>
   </PropertyGroup>
  ```
 
-- Use item groups to add additional files, eg:
+- Use item groups to add additional files, eg: add file 'my.dll' to convention based folder
 
 ```XML
   <ItemGroup>
-    <additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\MSBNuget\nuget.targets">
-      <targetFolder>MSBNuget/content/.build</targetFolder>
+    <additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\MSBNuget\my.dll">
+      <targetFolder>MSBNuget/content/libs/net45</targetFolder>
     </additionalFiles>
   </ItemGroup>
 ```
@@ -36,43 +37,21 @@ HOW TO USE
 ```
 project  
 |-'folder: nuspecname'  
-|--build  
-|--content  
-|--libs  
-|--tools  
-|-'file: nuspec'  
+|-|-build  
+|-|-content  
+|-|-libs  
+|-|-tools  
+|-|-'file: nuspec'  
 ```
 
-- Open build.targets and add/replace with the following  
-
-```XML
-  <Import Project="nuget.targets" />
-
-  <Target Name="Build">
-    <CallTarget Targets="NugetBuild" />
-  </Target>
-
-  <Target Name="Clean">
-    <CallTarget Targets="NugetClean" />
-  </Target>
-
-  <Target Name="Rebuild">
-    <CallTarget Targets="NugetRebuild" />
-  </Target>
-
-  <Target Name="Publish">
-    <CallTarget Targets="NugetPublish"/>
-  </Target>
-```  
-
+- build.targets will be replaced during install with nuget package [MSBuild.MSBBuildConvention](https://www.nuget.org/packages/MSBuild.MSBBuildConvention)
 
 Contributing
 ------------
-
 If you are interested in contributing,  
 
 1. Get a Github account  
 1. Fork the project  
-1. Make your feature addition or bugfix. Please also update the [changelog](https://github.com/DanielTheCoder/MSBuild.MSBNuget/edit/master/changelog.txt).  
+1. Make your feature addition or bugfix. Please also update the [changelog](https://github.com/DanielTheCoder/MSBuild.MSBNuget/blob/master/changelog.txt).  
 1. Send me a pull request via GitHub  
-  
+

changelog.txt

@@ -1,6 +1,25 @@
-1.0.3 -pre4 2013/10/23
+1.0.3 -pre8 2013/11/22
+Changes:
+ + NugetStage default changed honoring $(Configuration)
+	from: <NugetStage>$(MSBuildProjectDirectory)\objnugetstage\</NugetStage>
+	to: <NugetStage>$(MSBuildProjectDirectory)\obj\$(Configuration)\nugetstage\</NugetStage>
+ + nuget minClientVersion="2.7.2"
+ + NugkgPublishLocalNugetFeedFolder renamed to -> NugetPublishLocalNugetFeedFolder
+ + NugkgPublishReleaseFolder renamed to -> NugetPublishReleaseFolder
+
+ New Features:
+ + NugetFilterOnlyConventionWellKnownFolders: default is true, used to disable conventionbased folder filtering -> usage: resharper extension packages
+
+1.0.3 -pre7 2013/11/22
+Changes:
+ + *.targets no longer placed in tools folder -> .gitignore compatibility
+
+
+1.0.3 -pre6 2013/10/23
 Fixed issues:
  + pack: invalid arguments. -> Escaped command
+ + pack: invalid path -> nuget.exe from dependency package
+ + push: invalid path -> nuget.exe from dependency package
 
 Changes:
  + Use OutputPath instead hardcoded path bin/$(Configuration)
@@ -11,23 +30,18 @@ New Features:
  + Global override of nuget pack arguments for all nuspec files (NugetVersion, NugetMinClientVersion, NugetCommandPackArguments)
  + Logging publishing paths after publish
  + Nuget.exe not needed anymore in path var, dependency of package
+ + OutDir Support, should work with Team Foundation Server 2010/2012/2013
+
 
 1.0.2 -pre 2013/08/19
 Changes:
  + PublishDisabled renamed to -> NugetPublishDisabled
  + PublishToReleaseFolder renamed to -> NugetPublishToReleaseFolder
  + PublishToLocalNugetFeed renamed to -> NugetPublishToLocalNugetFeed
  + PublishToOfficialNugetFeed renamed to -> NugetPublishToOfficialNugetFeed
-
-New Features:
- + Disable all publish mechanism with: <PublishDisabled>true</PublishDisabled>
- + PublishToReleaseFolder with <PublishToLocalNugetFeed>true</PublishToLocalNugetFeed>
- + PublishToLocalNugetFeed with <PublishToLocalNugetFeed>true</PublishToLocalNugetFeed>
- + PublishToOfficialNugetFeed with <PublishToOfficialNugetFeed>true</PublishToOfficialNugetFeed>
 
 
 1.0.1 -pre 2013/08/19
-
 Changes:
  + NugkgReleaseFolder renamed to -> NugkgPublishReleaseFolder
  + NugkgPublishFolder renamed to -> NugkgPublishLocalNugetFeedFolder

src/.nuget/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NuGet.CommandLine" version="2.7.1" />
+  <package id="NuGet.CommandLine" version="2.7.3" />
 </packages>

src/MSBNuget.Nuget/.build/Configurations/TTV-DS06.props

@@ -5,8 +5,8 @@
     <NugetPublishToReleaseFolder Condition="'$(NugetPublishToReleaseFolder)'==''">true</NugetPublishToReleaseFolder>
     <NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">true</NugetPublishToLocalNugetFeed>
 
-    <NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">D:\Documents\SkyDrive\Development\_Galleries\nuget\MSBuild\</NugkgPublishLocalNugetFeedFolder>
-    <NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgPublishReleaseFolder>
+    <NugetPublishLocalNugetFeedFolder Condition="'$(NugetPublishLocalNugetFeedFolder)'==''">D:\Documents\SkyDrive\Development\_Galleries\nuget\MSBuild\</NugetPublishLocalNugetFeedFolder>
+    <NugetPublishReleaseFolder Condition="'$(NugetPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugetPublishReleaseFolder>
   </PropertyGroup>
 
 </Project>

src/MSBNuget.Nuget/.build/Configurations/TTV-DS07.props

@@ -5,8 +5,8 @@
     <NugetPublishToReleaseFolder Condition="'$(NugetPublishToReleaseFolder)'==''">true</NugetPublishToReleaseFolder>
     <NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">true</NugetPublishToLocalNugetFeed>
 
-    <NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">D:\Documents\SkyDrive\Development\_Galleries\nuget\MSBuild\</NugkgPublishLocalNugetFeedFolder>
-    <NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgPublishReleaseFolder>
+    <NugetPublishLocalNugetFeedFolder Condition="'$(NugetPublishLocalNugetFeedFolder)'==''">D:\Documents\SkyDrive\Development\_Galleries\nuget\MSBuild\</NugetPublishLocalNugetFeedFolder>
+    <NugetPublishReleaseFolder Condition="'$(NugetPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugetPublishReleaseFolder>
   </PropertyGroup>
 
 </Project>

src/MSBNuget.Nuget/.build/Configurations/default.props

@@ -5,8 +5,8 @@
     <NugetPublishToReleaseFolder Condition="'$(NugetPublishToReleaseFolder)'==''">false</NugetPublishToReleaseFolder>
     <NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">false</NugetPublishToLocalNugetFeed>
 
-    <NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">$(MSBuildProjectDirectory)\..\..\Publish\</NugkgPublishLocalNugetFeedFolder>
-    <NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgPublishReleaseFolder>
+    <NugetPublishLocalNugetFeedFolder Condition="'$(NugetPublishLocalNugetFeedFolder)'==''">$(MSBuildProjectDirectory)\..\..\Publish\</NugetPublishLocalNugetFeedFolder>
+    <NugetPublishReleaseFolder Condition="'$(NugetPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugetPublishReleaseFolder>
   </PropertyGroup>
 
 </Project>

src/MSBNuget.Nuget/.build/build.props

@@ -8,6 +8,8 @@
 
     <_nugetPackagesCustomConfigurationImportPath>$(MSBuildThisFileDirectory)Configurations\$(NugetPackagesCustomConfiguration).props</_nugetPackagesCustomConfigurationImportPath>
     <_nugetPackagesCustomConfigurationImportPath Condition="Exists('$(_nugetPackagesCustomConfigurationImportPath)')=='false'">$(MSBuildThisFileDirectory)Configurations\default.props</_nugetPackagesCustomConfigurationImportPath>
+
+    <NugetFilterOnlyConventionWellKnownFolders>false</NugetFilterOnlyConventionWellKnownFolders>
   </PropertyGroup>
 
   <!-- Conventional import of custom settings -->

src/MSBNuget.Nuget/.build/build.targets

@@ -1,8 +1,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
 
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\MSBNuget\nuget.targets" />
-
-  <Target Name="Build">
+  <Import Project="$(MSBuildThisFileDirectory)..\..\MSBNuget\nuget.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\MSBNuget\build\Legacy.100.targets" />
+
+  <Target Name="Build">  
+    <CallTarget Targets="$(BuildTargets)" />
     <CallTarget Targets="NugetBuild" />
   </Target>
 

src/MSBNuget.Nuget/MSBNuget.Legacy/MSBNuget.Legacy.nuspec

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <package >
-  <metadata>
+  <metadata minClientVersion="2.7.2">
     <id>MSBuild.MSBNuget.Legacy</id>
-    <version>1.0.3-pre</version>
+    <version>1.0.3-pre8</version>
     <title>Nuget convention based MSBuild Packager (Legacy)</title>
     <authors>Daniel Sack</authors>
     <owners>Daniel Sack</owners>

src/MSBNuget.Nuget/MSBNuget.Nuget.csproj

@@ -19,23 +19,21 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MSBNuget\build\MSBuild.MSBNuget.targets" />
-    <Compile Include="MSBBuildConvention\content\.build\build.targets" />
-    <None Include=".build\Configuration\TTV-DS07.props" />
-    <None Include=".build\Configuration\default.props" />
-    <None Include="MSBBuildConvention\MSBBuildConvention.nuspec.props">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="MSBBuildConvention\MSBBuildConvention.nuspec" />
+    <None Include=".build\Configurations\default.props" />
+    <None Include=".build\Configurations\TTV-DS06.props" />
+    <None Include=".build\Configurations\TTV-DS07.props" />
+    <None Include="MSBNuget\build\Legacy.100.targets" />
     <None Include="MSBNuget\MSBNuget.nuspec.props">
       <SubType>Designer</SubType>
     </None>
     <None Include="MSBNuget.Legacy\MSBNuget.Legacy.nuspec.props">
       <SubType>Designer</SubType>
     </None>
     <None Include="MSBNuget\MSBNuget.nuspec" />
-    <None Include="MSBNuget.Legacy\MSBNuget.Legacy.nuspec" />
+    <None Include="MSBNuget.Legacy\MSBNuget.Legacy.nuspec">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildProjectDirectory)\.build\build.props" />
   <Import Project="$(MSBuildProjectDirectory)\.build\build.targets" />
 </Project>

src/MSBNuget.Nuget/MSBNuget/MSBNuget.nuspec

@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <package >
 
-  <metadata>
+  <metadata minClientVersion="2.7.2">
     <id>MSBuild.MSBNuget</id>
-    <version>1.0.3-pre4</version>
+    <version>1.0.3-pre8</version>
     <title>Nuget convention based MSBuild Packager</title>
     <authors>Daniel Sack</authors>
     <owners>Daniel Sack</owners>
@@ -18,11 +18,9 @@
 
     <dependencies>
       <dependency id="MSBuild.MSBBuildConvention" />
-      <dependency id="NuGet.CommandLine" version="2.7.1" />
+      <dependency id="NuGet.CommandLine" version="2.7.3" />
     </dependencies>
 
   </metadata>
 
-
-
 </package>

src/MSBNuget.Nuget/MSBNuget/MSBNuget.nuspec.props

@@ -2,7 +2,7 @@
 
   <ItemGroup Label="MSBNuget">
     <additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\MSBNuget\nuget.targets">
-      <targetFolder>MSBNuget/tools</targetFolder>
+      <targetFolder>MSBNuget/build</targetFolder>
     </additionalFiles>
     <!--<additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\MSBNuget\build.targets">
       <targetFolder>MSBNuget/build</targetFolder>