Upgraded to MSBuild.Community.Tasks that I built in my fork, so that I have extra ILMerge task properties.

4 files changed, 97 insertions, 40 deletions

diff --git a/lib/MSBuild.Community.Tasks.Targets b/lib/MSBuild.Community.Tasks.Targets
index e0e2378..09f5617 100644
--- a/lib/MSBuild.Community.Tasks.Targets
+++ b/lib/MSBuild.Community.Tasks.Targets
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- $Id: MSBuild.Community.Tasks.Targets 480 2009-09-22 16:49:00Z pwelter34 $ -->
+  <!-- $Id: MSBuild.Community.Tasks.Targets 518 2011-11-17 05:12:19Z pwelter34 $ -->
 
   <PropertyGroup>
     <MSBuildCommunityTasksPath Condition="'$(MSBuildCommunityTasksPath)' == ''">$(MSBuildExtensionsPath)\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
@@ -91,8 +91,9 @@
   <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Subversion.SvnInfo" />
   <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Subversion.SvnUpdate" />
   <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Subversion.SvnVersion" />
+  <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Subversion.SvnStatus" />
 
-  <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Tfs.TfsVersion" />
+  <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Tfs.TfsClient" />
 
   <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.TemplateFile" />
   <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Time" />
@@ -126,7 +127,10 @@
   <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.SymbolServer.SymStore" />
 
   <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Net.HttpRequest" />
-  
+
+  <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.NuGet.NuGetPack" />
+  <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.NuGet.NuGetPush" />
+
   <ItemGroup>
     <FxCopRuleAssemblies Include="UsageRules.dll"/>
     <FxCopRuleAssemblies Include="SecurityRules.dll"/>
diff --git a/lib/MSBuild.Community.Tasks.dll b/lib/MSBuild.Community.Tasks.dll
index 765156a..cd17665 100644
--- a/lib/MSBuild.Community.Tasks.dll
+++ b/lib/MSBuild.Community.Tasks.dll
diff --git a/lib/MSBuild.Community.Tasks.pdb b/lib/MSBuild.Community.Tasks.pdb
index f7944fb..41a108d 100644
--- a/lib/MSBuild.Community.Tasks.pdb
+++ b/lib/MSBuild.Community.Tasks.pdb
diff --git a/lib/MSBuild.Community.Tasks.xml b/lib/MSBuild.Community.Tasks.xml
index fb481f1..6139cc4 100644
--- a/lib/MSBuild.Community.Tasks.xml
+++ b/lib/MSBuild.Community.Tasks.xml
@@ -1688,90 +1688,126 @@
             Optional; the name of the file to write the response to.
             </summary>
         </member>
-        <member name="T:MSBuild.Community.Tasks.NuGet">
+        <member name="T:MSBuild.Community.Tasks.NuGet.NuGetBase">
             <summary>
-            Creates a NuGet package based on the specified manifest (Nuspec) file.
-            Can set the version number in the manifest prior to building the package.
+            A base class for NuGet tasks.
             </summary>
         </member>
-        <member name="M:MSBuild.Community.Tasks.NuGet.Execute">
+        <member name="M:MSBuild.Community.Tasks.NuGet.NuGetBase.GenerateFullPathToTool">
             <summary>
-            Runs the exectuable file with the specified task parameters.
+            Returns the fully qualified path to the executable file.
             </summary>
             <returns>
-            true if the task runs successfully; otherwise, false.
+            The fully qualified path to the executable file.
             </returns>
         </member>
-        <member name="M:MSBuild.Community.Tasks.NuGet.GenerateCommandLineCommands">
+        <member name="M:MSBuild.Community.Tasks.NuGet.NuGetBase.GetWorkingDirectory">
             <summary>
-            Returns a string value containing the command line arguments to pass directly to the executable file.
+            Returns the directory in which to run the executable file.
             </summary>
             <returns>
-            A string value containing the command line arguments to pass directly to the executable file.
+            The directory in which to run the executable file, or a null reference (Nothing in Visual Basic) if the executable file should be run in the current directory.
             </returns>
         </member>
-        <member name="M:MSBuild.Community.Tasks.NuGet.GenerateFullPathToTool">
+        <member name="P:MSBuild.Community.Tasks.NuGet.NuGetBase.WorkingDirectory">
             <summary>
-            Returns the fully qualified path to the executable file.
+            Gets or sets the working directory.
             </summary>
+            <value>The working directory.</value>
             <returns>
-            The fully qualified path to the executable file.
+            The directory in which to run the executable file, or a null reference (Nothing in Visual Basic) if the executable file should be run in the current directory.
             </returns>
         </member>
-        <member name="M:MSBuild.Community.Tasks.NuGet.GetWorkingDirectory">
+        <member name="P:MSBuild.Community.Tasks.NuGet.NuGetBase.ToolName">
             <summary>
-            Returns the directory in which to run the executable file.
+            Gets the name of the executable file to run.
+            </summary>
+            <value></value>
+            <returns>The name of the executable file to run.</returns>
+        </member>
+        <member name="T:MSBuild.Community.Tasks.NuGet.NuGetPack">
+            <summary>
+            Creates a NuGet package based on the specified nuspec or project file.
+            </summary>
+        </member>
+        <member name="M:MSBuild.Community.Tasks.NuGet.NuGetPack.GenerateCommandLineCommands">
+            <summary>
+            Returns a string value containing the command line arguments to pass directly to the executable file.
             </summary>
             <returns>
-            The directory in which to run the executable file, or a null reference (Nothing in Visual Basic) if the executable file should be run in the current directory.
+            A string value containing the command line arguments to pass directly to the executable file.
             </returns>
         </member>
-        <member name="P:MSBuild.Community.Tasks.NuGet.Manifest">
+        <member name="P:MSBuild.Community.Tasks.NuGet.NuGetPack.File">
             <summary>
-            The location of the manifest (Nuspec) file to create a package.
+            The location of the nuspec or project file to create a package.
             </summary>
-            <value>The manifest.</value>
         </member>
-        <member name="P:MSBuild.Community.Tasks.NuGet.OutputDirectory">
+        <member name="P:MSBuild.Community.Tasks.NuGet.NuGetPack.OutputDirectory">
             <summary>
             Specifies the directory for the created NuGet package.
             </summary>
-            <value>The output directory.</value>
         </member>
-        <member name="P:MSBuild.Community.Tasks.NuGet.BasePath">
+        <member name="P:MSBuild.Community.Tasks.NuGet.NuGetPack.Version">
+            <summary>
+            Overrides the version number from the nuspec file.
+            </summary>
+        </member>
+        <member name="P:MSBuild.Community.Tasks.NuGet.NuGetPack.BasePath">
             <summary>
-            The Base Path of the files defined in the nuspec file.
+            The base path of the files defined in the nuspec file.
             </summary>
-            <value>The base path.</value>
         </member>
-        <member name="P:MSBuild.Community.Tasks.NuGet.Verbose">
+        <member name="P:MSBuild.Community.Tasks.NuGet.NuGetPack.Verbose">
             <summary>
             Shows verbose output for package building.
             </summary>
             <value><c>true</c> if verbose; otherwise, <c>false</c>.</value>
         </member>
-        <member name="P:MSBuild.Community.Tasks.NuGet.Version">
+        <member name="P:MSBuild.Community.Tasks.NuGet.NuGetPack.Symbols">
             <summary>
-            Sets the version of the package in the manifest (Nuspec) file.
-            The version must specify at least two places "X.X".
+            Determines if a package containing sources and symbols should be created. When specified with a nuspec, 
+            creates a regular NuGet package file and the corresponding symbols package.
             </summary>
-            <value>The version to set in the manifest.</value>
+            <value>
+              <c>true</c> if symbols; otherwise, <c>false</c>.
+            </value>
         </member>
-        <member name="P:MSBuild.Community.Tasks.NuGet.WorkingDirectory">
+        <member name="T:MSBuild.Community.Tasks.NuGet.NuGetPush">
             <summary>
-            Gets or sets the working directory.
+            Pushes a package to the server and optionally publishes it.
+            </summary>
+        </member>
+        <member name="M:MSBuild.Community.Tasks.NuGet.NuGetPush.GenerateCommandLineCommands">
+            <summary>
+            Returns a string value containing the command line arguments to pass directly to the executable file.
             </summary>
-            <value>The working directory.</value>
             <returns>
-            The directory in which to run the executable file, or a null reference (Nothing in Visual Basic) if the executable file should be run in the current directory.
+            A string value containing the command line arguments to pass directly to the executable file.
             </returns>
         </member>
-        <member name="P:MSBuild.Community.Tasks.NuGet.ToolName">
+        <member name="P:MSBuild.Community.Tasks.NuGet.NuGetPush.File">
             <summary>
-            Gets the name of the executable file to run.
+            The path to the package to push the package to the server.
+            </summary>
+        </member>
+        <member name="P:MSBuild.Community.Tasks.NuGet.NuGetPush.APIKey">
+            <summary>
+            The API key to use for push to the server.
+            </summary>
+        </member>
+        <member name="P:MSBuild.Community.Tasks.NuGet.NuGetPush.Source">
+            <summary>
+            Specifies the server URL.
             </summary>
-            <value></value>
-            <returns>The name of the executable file to run.</returns>
+        </member>
+        <member name="P:MSBuild.Community.Tasks.NuGet.NuGetPush.CreateOnly">
+            <summary>
+            Specifies if the package should be created and uploaded to the server but not published to the server. False by default.
+            </summary>
+            <value>
+              <c>true</c> if create only; otherwise, <c>false</c>.
+            </value>
         </member>
         <member name="M:MSBuild.Community.Tasks.PathUtil.RelativePathTo(System.String,System.String)">
             <summary>  
@@ -5127,6 +5163,16 @@
             <para>The default value is <c>false</c>.</para>
             </remarks>
         </member>
+        <member name="P:MSBuild.Community.Tasks.ILMerge.AllowDuplicateAttributes">
+            <summary>
+            Gets or sets a value indicating whether to copy assembly attributes from all merged assemblies
+            into the unified assembly even if duplicate assembly attributes would result.
+            </summary>
+            <remarks>
+            <para>Applicable only when <see cref="P:MSBuild.Community.Tasks.ILMerge.CopyAttributes"/> is <c>true</c></para>
+            <para>Corresponds to command line option "/allowMultiple".</para>
+            </remarks>
+        </member>
         <member name="P:MSBuild.Community.Tasks.ILMerge.DebugInfo">
             <summary>
             Gets or sets a value indicating whether 
@@ -6643,6 +6689,12 @@
             Initializes a new instance of the <see cref="T:FileUpdate"/> class.
             </summary>
         </member>
+        <member name="F:MSBuild.Community.Tasks.FileUpdate._useDefaultEncoding">
+            Maintain the behaviour of the original implementation for compatibility
+            (i.e. initialize _useDefaultEncoding with false) and use utf-8-without-bom,  
+            which is Microsoft's default encoding, only when Encoding property is set 
+            to "utf-8-without-bom". 
+        </member>
         <member name="M:MSBuild.Community.Tasks.FileUpdate.Execute">
             <summary>
             When overridden in a derived class, executes the task.
@@ -6700,7 +6752,8 @@
             The character encoding used to read and write the file.
             </summary>
             <remarks>Any value returned by <see cref="P:System.Text.Encoding.WebName"/> is valid input.
-            <para>The default is <c>utf-8</c></para></remarks>
+            <para>The default is <c>utf-8</c></para>
+            <para>Additionally, <c>utf-8-without-bom</c>can be used.</para></remarks>
         </member>
         <member name="P:MSBuild.Community.Tasks.FileUpdate.WarnOnNoUpdate">
             <summary>