updated dependencies

dittodhole · Mar 26, 2015 · 662e70b · 662e70b
1 parent 3348d4c
commit 662e70b
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 67 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ obj
 *.suo
 
 # mstest test results
-TestResults
+TestResults
+packages/*
diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="NuGet.Build" version="0.24" />
   <package id="NuGet.CommandLine" version="2.5.0" />
+  <package id="NuGet.CommandLine" version="2.8.3" />
 </packages>
diff --git a/sharpLightFtp.NuGetPackage/_MSBuild/NuGetPackageAndPublish.targets b/sharpLightFtp.NuGetPackage/_MSBuild/NuGetPackageAndPublish.targets
@@ -1,35 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--NuGetPackageAndPublish.targets v0.6.0.1 - See https://github.com/JoelHT-Landmark/NuGet-PackageNPublish for more information -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
+
   <PropertyGroup>
 
-    <RegenerateNuSpecFiles Condition="$(RegenerateNuSpecFiles) == ''">true</RegenerateNuSpecFiles>
+    <RegenerateNuSpecFiles Condition="($(RegenerateNuSpecFiles) == '' Or $(RegenerateNuSpecFiles) == '*Undefined*')">true</RegenerateNuSpecFiles>
+    <TfsCheckOut Condition="($(TfsCheckOut) == '' Or $(TfsCheckOut) == '*Undefined*')">true</TfsCheckOut>
+
     <CreateNuGetPackage Condition="$(CreateNuGetPackage) == ''">true</CreateNuGetPackage>
     <PublishNuGetPackage Condition="$(PublishNuGetPackage) == ''">false</PublishNuGetPackage>
     <CreateSymbolPackage Condition="$(CreateSymbolPackage) == ''">true</CreateSymbolPackage>
     <PublishSymbolPackage Condition="$(PublishSymbolPackage) == ''">false</PublishSymbolPackage>
-    
+
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
 
     <NuGetToolsPath Condition="$(NuGetToolsPath) == '' Or $(NuGetToolsPath) == '*Undefined*'">$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
     <NuGetExePath Condition="$(NuGetExePath) == '' Or $(NuGetExePath) == '*Undefined*'">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
     <PackagesConfig Condition="$(PackagesConfig) == '' Or $(PackagesConfig) == '*Undefined*'">$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
     <PackagesDir Condition="$(PackagesDir) == '' Or $(PackagesDir) == '*Undefined*'">$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>
 
-    <TTGenPath Condition="($(TTGenPath) == '' Or $(TTGenPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath)\..\Common Files\Microsoft Shared\TextTemplating\10.0\TextTransform.exe'))">$(MSBuildExtensionsPath32)\..\Common Files\Microsoft Shared\TextTemplating\10.0\TextTransform.exe</TTGenPath>
-    <TTGenPath Condition="($(TTGenPath) == '' Or $(TTGenPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath32)\..\Common Files\Microsoft Shared\TextTemplating\11.0\TextTransform.exe'))">$(MSBuildExtensionsPath32)\..\Common Files\Microsoft Shared\TextTemplating\11.0\TextTransform.exe</TTGenPath>
-    <TFPath Condition="$(TFPath) == '' Or $(NuGetToolsPathTFPath) == '*Undefined*'">$(MSBuildExtensionsPath32)\..\Microsoft Visual Studio 10.0\Common7\IDE\tf.exe</TFPath>
+    <!--Find the TextTransform.exe helper -->
+    <TTGenPath Condition="($(TTGenPath) == '' Or $(TTGenPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath)\..\Common Files\Microsoft Shared\TextTemplating\10.0\TextTransform.exe'))">$(MSBuildExtensionsPath)\..\Common Files\Microsoft Shared\TextTemplating\10.0\TextTransform.exe</TTGenPath>
+    <TTGenPath Condition="($(TTGenPath) == '' Or $(TTGenPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath)\..\Common Files\Microsoft Shared\TextTemplating\11.0\TextTransform.exe'))">$(MSBuildExtensionsPath)\..\Common Files\Microsoft Shared\TextTemplating\11.0\TextTransform.exe</TTGenPath>
+    <TTGenPath Condition="($(TTGenPath) == '' Or $(TTGenPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath)\..\Common Files\Microsoft Shared\TextTemplating\12.0\TextTransform.exe'))">$(MSBuildExtensionsPath)\..\Common Files\Microsoft Shared\TextTemplating\12.0\TextTransform.exe</TTGenPath>
+    <TTGenPath Condition="($(TTGenPath) == '' Or $(TTGenPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath32)\..\Common Files\Microsoft Shared\TextTemplating\10.0\TextTransform.exe'))">$(MSBuildExtensionsPath)\..\Common Files\Microsoft Shared\TextTemplating\10.0\TextTransform.exe</TTGenPath>
+    <TTGenPath Condition="($(TTGenPath) == '' Or $(TTGenPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath32)\..\Common Files\Microsoft Shared\TextTemplating\11.0\TextTransform.exe'))">$(MSBuildExtensionsPath)\..\Common Files\Microsoft Shared\TextTemplating\11.0\TextTransform.exe</TTGenPath>
+    <TTGenPath Condition="($(TTGenPath) == '' Or $(TTGenPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath32)\..\Common Files\Microsoft Shared\TextTemplating\12.0\TextTransform.exe'))">$(MSBuildExtensionsPath)\..\Common Files\Microsoft Shared\TextTemplating\12.0\TextTransform.exe</TTGenPath>
+
+    <!--Find the tf.exe helper -->
+    <TFPath Condition="($(TFPath) == '' Or $(TFPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath)\..\Microsoft Visual Studio 10.0\Common7\IDE\tf.exe'))">$(MSBuildExtensionsPath)\..\Microsoft Visual Studio 10.0\Common7\IDE\tf.exe</TFPath>
+    <TFPath Condition="($(TFPath) == '' Or $(TFPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath)\..\Microsoft Visual Studio 11.0\Common7\IDE\tf.exe'))">$(MSBuildExtensionsPath)\..\Microsoft Visual Studio 11.0\Common7\IDE\tf.exe</TFPath>
+    <TFPath Condition="($(TFPath) == '' Or $(TFPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath)\..\Microsoft Visual Studio 12.0\Common7\IDE\tf.exe'))">$(MSBuildExtensionsPath)\..\Microsoft Visual Studio 12.0\Common7\IDE\tf.exe</TFPath>
+    <TFPath Condition="($(TFPath) == '' Or $(TFPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft Visual Studio 10.0\Common7\IDE\tf.exe'))">$(MSBuildExtensionsPath32)\..\Microsoft Visual Studio 10.0\Common7\IDE\tf.exe</TFPath>
+    <TFPath Condition="($(TFPath) == '' Or $(TFPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft Visual Studio 11.0\Common7\IDE\tf.exe'))">$(MSBuildExtensionsPath32)\..\Microsoft Visual Studio 11.0\Common7\IDE\tf.exe</TFPath>
+    <TFPath Condition="($(TFPath) == '' Or $(TFPath) == '*Undefined*') And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft Visual Studio 12.0\Common7\IDE\tf.exe'))">$(MSBuildExtensionsPath32)\..\Microsoft Visual Studio 12.0\Common7\IDE\tf.exe</TFPath>
 
     <NuGetPackageName>$(ProjectDir)$(AssemblyName.Replace(".NuGetPackage", ""))</NuGetPackageName>
-    
+
     <PublishNuGetPackageTarget Condition="$(PublishNuGetPackageTarget) == '' Or $(PublishNuGetPackageTarget) == '*Undefined*'">http://nuget.org/</PublishNuGetPackageTarget>
     <PublishNuGetPackageTargetKey Condition="$(PublishNuGetPackageTargetKey) == '' Or $(PublishNuGetPackageTargetKey) == '*Undefined*'"></PublishNuGetPackageTargetKey>
     <PublishSymbolPackageTarget Condition="$(PublishSymbolPackageTarget) == '' Or $(PublishSymbolPackageTarget) == '*Undefined*'">http://symbolsource.org/</PublishSymbolPackageTarget>
     <PublishSymbolPackageTargetKey Condition="$(PublishSymbolPackageTargetKey) == '' Or $(PublishSymbolPackageTargetKey) == '*Undefined*'"></PublishSymbolPackageTargetKey>
 
     <BuildDependsOn Condition="$(CreateNuGetPackage) == 'true'">
-	  GenerateNuSpecFiles;
+      GenerateNuSpecFiles;
       $(BuildDependsOn);
       CreateNuGetPackage;
       CopyPackageToDropLocation;
@@ -54,7 +68,7 @@
   <ItemGroup>
     <NuSpecTemplateFiles Include="@(NuSpecFiles->'.\%(FileName).tt')" />
   </ItemGroup>
-  
+
   <Choose>
     <When Condition="$(OutDir) != '' and $(OutDir) != '*Undefined*'">
       <PropertyGroup>
@@ -72,77 +86,82 @@
       </PropertyGroup>
     </Otherwise>
   </Choose>
-  
+
   <!-- Check all the pre-requisites are in place -->
-    <Target Name="CheckNuGetPackageAndPublishPrerequisites">
-      <!-- Raise an error if we're unable to locate nuget.exe  -->
-      <Error Condition="!Exists('$(NuGetExePath)') and ($(CreateNuGetPackage) == 'true' or $(PublishNuGetPackage) == 'true')" Text="Unable to locate '$(NuGetExePath)'" />
-      <Error Condition="!Exists('$(TTGenPath)') and $(RegenerateNuSpecFiles) == 'true'" Text="Unable to locate '$(TTGenPath)'" />
-      <Message Condition="!Exists('$(TFPath)') and $(RegenerateNuSpecFiles) == 'true'" Text="Unable to locate '$(TFPath)'" />
-    </Target>
-
-    <!-- Get the version info from the assembly to use as the version number of the assembly -->
-    <Target Name="ExtractVersionInfo">      
-      <GetAssemblyIdentity AssemblyFiles="$(IntermediateOutputPath)\$(AssemblyName).dll">
-        <Output TaskParameter="Assemblies" ItemName="MyAssembly" />
-      </GetAssemblyIdentity>
-    </Target>
-
-    <!-- write the version info out to an xml file for use by powershell scrips, etc -->
-    <Target Name="WriteVersionsFile" DependsOnTargets="ExtractVersionInfo">
-      <ItemGroup>
-        <Line Include="true">
-          <Text>&lt;?xml version="1.0" encoding="utf-8" ?&gt;</Text>
-        </Line>
-        <Line Include="true">
-          <Text>&lt;package&gt;</Text>
-        </Line>
-        <Line Include="true">
-          <Text>&lt;version&gt;%(MyAssembly.FileVersion)&lt;/version&gt;</Text>
-        </Line>
-        <Line Include="true">
-          <Text>&lt;/package&gt;</Text>
-        </Line>
-        <LineText Include="%(Line.Text)" />
-      </ItemGroup>
-      <WriteLinesToFile File="$(ProjectDir)$(AssemblyName).VersionInfo.xml" Lines="@(LineText)" Overwrite="true" />
-    </Target>
-
-    <!-- Copies the assemblies and symbol files we're packaging into the correct locations-->
-    <Target Name="CopyAssembliesToLibDirectories">
-      <ItemGroup>
-        <Net40Assemblies Include="$(CopySourceFolder)\*.dll" Exclude="$(CopySourceFolder)\*.Silverlight.dll;$(CopySourceFolder)\*.Tests.dll" />
-        <Net40Symbols Include="$(CopySourceFolder)\*.pdb" Exclude="$(CopySourceFolder)\*.Silverlight.pdb;$(CopySourceFolder)\*.Tests.pdb" />
-        <SL40Assemblies Include="$(CopySourceFolder)\*.Silverlight.dll" />
-        <SL40Symbols Include="$(CopySourceFolder)\*.Silverlight.pdb" />
-      </ItemGroup>
-      <Copy DestinationFolder="$(ProjectDir)Package\lib\Net40" SourceFiles="@(Net40Assemblies)" SkipUnchangedFiles="false"  />
-      <Copy DestinationFolder="$(ProjectDir)Package\lib\Net40" SourceFiles="@(Net40Symbols)" SkipUnchangedFiles="false"  />
-      <Copy DestinationFolder="$(ProjectDir)Package\lib\SL40" SourceFiles="@(SL40Assemblies)" SkipUnchangedFiles="false" />
-      <Copy DestinationFolder="$(ProjectDir)Package\lib\SL40" SourceFiles="@(SL40Symbols)" SkipUnchangedFiles="false" />
-    </Target>
-
-  <Target Name="CheckOutNuSpecFiles" DependsOnTargets="CheckNuGetPackageAndPublishPrerequisites" Condition="@(NuSpecFiles) != '' and Exists('$(TFPath)') and $(RegenerateNuSpecFiles) == 'true'">
+  <Target Name="CheckNuGetPackageAndPublishPrerequisites">
+    <!-- Raise an error if we're unable to locate nuget.exe  -->
+    <Error Condition="!Exists('$(NuGetExePath)') and ($(CreateNuGetPackage) == 'true' or $(PublishNuGetPackage) == 'true')" Text="Unable to locate 'NuGet.exe'" />
+    <Error Condition="!Exists('$(TTGenPath)') and $(RegenerateNuSpecFiles) == 'true'" Text="Unable to locate 'TextTemplate.exe' - install a VS-SDK or build with /p:RegenerateNuSpecFiles=false" />
+    <Message Condition="!Exists('$(TFPath)') and $(TfsCheckOut) == 'true'" Text="Unable to locate 'Tf.exe' - install TFS client or build with /p:TfsCheckOut=false" />
+  </Target>
+
+  <!-- Get the version info from the assembly to use as the version number of the assembly -->
+  <Target Name="ExtractVersionInfo">
+    <GetAssemblyIdentity AssemblyFiles="$(IntermediateOutputPath)\$(AssemblyName).dll">
+      <Output TaskParameter="Assemblies" ItemName="MyAssembly" />
+    </GetAssemblyIdentity>
+  </Target>
+
+  <!-- write the version info out to an xml file for use by powershell scrips, etc -->
+  <Target Name="WriteVersionsFile" DependsOnTargets="ExtractVersionInfo">
+    <ItemGroup>
+      <Line Include="true">
+        <Text>&lt;?xml version="1.0" encoding="utf-8" ?&gt;</Text>
+      </Line>
+      <Line Include="true">
+        <Text>&lt;package&gt;</Text>
+      </Line>
+      <Line Include="true">
+        <Text>&lt;version&gt;%(MyAssembly.FileVersion)&lt;/version&gt;</Text>
+      </Line>
+      <Line Include="true">
+        <Text>&lt;/package&gt;</Text>
+      </Line>
+      <LineText Include="%(Line.Text)" />
+    </ItemGroup>
+    <WriteLinesToFile File="$(ProjectDir)$(AssemblyName).VersionInfo.xml" Lines="@(LineText)" Overwrite="true" />
+  </Target>
+
+  <!-- Copies the assemblies and symbol files we're packaging into the correct locations-->
+  <Target Name="CopyAssembliesToLibDirectories">
+    <ItemGroup>
+      <Net40Assemblies Include="$(CopySourceFolder)\*.dll" Exclude="$(CopySourceFolder)\*.Silverlight.dll;$(CopySourceFolder)\*.Tests.dll" />
+      <Net40XmlDocs Include="$(CopySourceFolder)\*.xml" Exclude="$(CopySourceFolder)\*.Silverlight.xml;$(CopySourceFolder)\*.Tests.xml" />
+      <Net40Symbols Include="$(CopySourceFolder)\*.pdb" Exclude="$(CopySourceFolder)\*.Silverlight.pdb;$(CopySourceFolder)\*.Tests.pdb" />
+      <SL40Assemblies Include="$(CopySourceFolder)\*.Silverlight.dll" />
+      <SL40XmlDocs Include="$(CopySourceFolder)\*.Silverlight.xml" />
+      <SL40Symbols Include="$(CopySourceFolder)\*.Silverlight.pdb" />
+    </ItemGroup>
+    <Copy DestinationFolder="$(ProjectDir)Package\lib\Net40" SourceFiles="@(Net40Assemblies)" SkipUnchangedFiles="false"  />
+    <Copy DestinationFolder="$(ProjectDir)Package\lib\Net40" SourceFiles="@(Net40XmlDocs)" SkipUnchangedFiles="false"  />
+    <Copy DestinationFolder="$(ProjectDir)Package\lib\Net40" SourceFiles="@(Net40Symbols)" SkipUnchangedFiles="false"  />
+    <Copy DestinationFolder="$(ProjectDir)Package\lib\SL40" SourceFiles="@(SL40Assemblies)" SkipUnchangedFiles="false" />
+    <Copy DestinationFolder="$(ProjectDir)Package\lib\SL40" SourceFiles="@(SL40XmlDocs)" SkipUnchangedFiles="false" />
+    <Copy DestinationFolder="$(ProjectDir)Package\lib\SL40" SourceFiles="@(SL40Symbols)" SkipUnchangedFiles="false" />
+  </Target>
+
+  <Target Name="CheckOutNuSpecFiles" DependsOnTargets="CheckNuGetPackageAndPublishPrerequisites" 
+          Condition="@(NuSpecFiles) != '' and Exists('$(TFPath)') and $(RegenerateNuSpecFiles) == 'true' and $(TfsCheckOut) == 'true'">
     <Exec ContinueOnError="true" Command="&quot;$(TFPath)&quot; checkout &quot;%(NuSpecFiles.FullPath)&quot;" Condition="($(SccProvider) == 'SAK')" />
   </Target>
-  
+
   <Target Name="GenerateNuSpecFiles" DependsOnTargets="CheckNuGetPackageAndPublishPrerequisites;CheckOutNuSpecFiles" Condition="@(NuSpecTemplateFiles) != '' and Exists('$(TTGenPath)') and $(RegenerateNuSpecFiles) == 'true'">
     <Exec ContinueOnError="true" Command="attrib -r &quot;%(NuSpecFiles.FullPath)&quot;" />
     <Exec Command="&quot;$(TTGenPath)&quot; &quot;%(NuSpecTemplateFiles.FullPath)&quot;" />
   </Target>
-  
+
   <Target Name="CreateNuGetPackage" DependsOnTargets="CheckNuGetPackageAndPublishPrerequisites;ExtractVersionInfo;CopyAssembliesToLibDirectories">
     <!-- Build without symbols if $(CreateSymbolPackage) == 'False' -->
-    <Exec Command="&quot;$(NuGetExePath)&quot; pack &quot;$(ProjectDir)$(AssemblyName).nuspec&quot; -BasePath &quot;$(ProjectDir)Package&quot; -Verbose -Exclude &quot;**\$(AssemblyName).dll;**\$(AssemblyName).pdb&quot;" Condition="$(CreateSymbolPackage) == 'False'" />
+    <Exec Command="&quot;$(NuGetExePath)&quot; pack &quot;$(ProjectDir)$(AssemblyName).nuspec&quot; -BasePath &quot;$(ProjectDir)Package&quot; -Verbosity Detailed -Exclude &quot;**\$(AssemblyName).dll;**\$(AssemblyName).pdb&quot;" Condition="$(CreateSymbolPackage) == 'False'" />
     <!-- Build with symbols if $(CreateSymbolPackage) == 'True' -->
-    <Exec Command="&quot;$(NuGetExePath)&quot; pack &quot;$(ProjectDir)$(AssemblyName).nuspec&quot; -Symbols -BasePath &quot;$(ProjectDir)Package&quot; -Verbose -Exclude &quot;**\$(AssemblyName).dll;**\$(AssemblyName).pdb&quot;" Condition="$(CreateSymbolPackage) == 'True'" />
+    <Exec Command="&quot;$(NuGetExePath)&quot; pack &quot;$(ProjectDir)$(AssemblyName).nuspec&quot; -Symbols -BasePath &quot;$(ProjectDir)Package&quot; -Verbosity Detailed -Exclude &quot;**\$(AssemblyName).dll;**\$(AssemblyName).pdb&quot;" Condition="$(CreateSymbolPackage) == 'True'" />
   </Target>
 
   <Target Name="PublishNuGetPackage" DependsOnTargets="CreateNuGetPackage" Condition="$(PublishNuGetPackage) == 'True'">
     <ItemGroup>
       <NuPkgFiles Include="*.nupkg" Exclude="*.Symbols.nupkg" />
     </ItemGroup>
-    
+
     <Exec Command="&quot;$(NuGetExePath)&quot; push &quot;@(NuPkgFiles)&quot; -s $(PublishNuGetPackageTarget) &quot;$(PublishNuGetPackageTargetKey)&quot;" />
   </Target>
 

diff --git a/sharpLightFtp.NuGetPackage/packages.config b/sharpLightFtp.NuGetPackage/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NuGet.PackageNPublish" version="0.6.0.1" targetFramework="net45" />
+  <package id="NuGet.PackageNPublish" version="0.8.0.2" targetFramework="net45" />
 </packages>
diff --git a/sharpLightFtp.NuGetPackage/sharpLightFtp.NuGetPackage.csproj b/sharpLightFtp.NuGetPackage/sharpLightFtp.NuGetPackage.csproj
@@ -47,7 +47,6 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="packages.config" />
-    <None Include="_MSBuild\NuGetPackageAndPublish.targets" />
     <None Include="sharpLightFtp.NuGetPackage.nuspec">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -63,6 +62,7 @@
     <None Include="Package\tools\init.ps1" />
     <None Include="Package\tools\install.ps1" />
     <None Include="Package\tools\uninstall.ps1" />
+    <None Include="_MSBuild\NuGetPackageAndPublish.targets" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />