Merge branch 'djdelaney-feature/nugetpackoptions' into develop

* djdelaney-feature/nugetpackoptions:
  Expose the Tool nuget pack option in Cake

src/Cake.Common.Tests/Unit/Tools/NuGet/Pack/NuGetPackSettingsTests.cs

@@ -40,6 +40,16 @@ public void Should_Set_Symbols_To_False_By_Default()
                 // Then
                 Assert.False(settings.Symbols);
             }
+
+            [Fact]
+            public void Should_Set_OutputToToolFolder_To_False_By_Default()
+            {
+                // Given, When
+                var settings = new NuGetPackSettings();
+
+                // Then
+                Assert.False(settings.OutputToToolFolder);
+            }
         }
     }
 }

src/Cake.Common.Tests/Unit/Tools/NuGet/Pack/NuGetPackerTests.cs

@@ -1090,6 +1090,20 @@ public void Should_Pack_If_Sufficient_Settings_For_MetaPackage_With_TargetFrameW
                         Resources.Nuspec_Metadata_WithTargetFrameworkDependencies.NormalizeLineEndings(),
                         result.NuspecContent.NormalizeLineEndings());
                 }
+
+                [Fact]
+                public void Should_Add_Tool_Flag_To_Arguments_If_Set()
+                {
+                    // Given
+                    var fixture = new NuGetPackerWithNuSpecFixture();
+                    fixture.Settings.OutputToToolFolder = true;
+
+                    // When
+                    var result = fixture.Run();
+
+                    // Then
+                    Assert.Equal("pack \"/Working/existing.temp.nuspec\" -Tool", result.Args);
+                }
             }
         }
     }

src/Cake.Common/Tools/NuGet/Pack/NuGetPackSettings.cs

@@ -195,5 +195,14 @@ public sealed class NuGetPackSettings : ToolSettings
         /// </summary>
         /// <value>The package language.</value>
         public string Language { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the files should be packed into the tool folder.
+        /// Defaults to <c>false</c>.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the output should be placed in the tool folder inside the nuget package; otherwise <c>false</c>.
+        /// </value>
+        public bool OutputToToolFolder { get; set; }
     }
 }

src/Cake.Common/Tools/NuGet/Pack/NuGetPacker.cs

@@ -197,6 +197,12 @@ private ProcessArgumentBuilder GetArguments(FilePath filePath, NuGetPackSettings
                 builder.Append(settings.MSBuildVersion.Value.ToString("D"));
             }
 
+            // Use the tool folder
+            if (settings.OutputToToolFolder)
+            {
+                builder.Append("-Tool");
+            }
+
             // Properties
             if (settings.Properties != null && settings.Properties.Count > 0)
             {