Updating nuget package generation files with some fixes.

Author: stgates

Release/nuget/cpprestsdk.nuspec

@@ -11,10 +11,15 @@
         <iconUrl>https://download-codeplex.sec.s-msft.com/Download?ProjectName=casablanca&amp;DownloadId=630102&amp;Build=20425</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <summary>"The C++ REST SDK is a cross-platform, modern, and asynchronous library that enables developers to access and author connected applications"</summary>
-        <description>"This library is a Microsoft effort to support cloud-based client-server communication in native code using a modern asynchronous C++ API design. The C++ REST SDK (codename "Casablanca") is a project to start exploring how to best support C++ developers who want to take advantage of the radical shift in software architecture that cloud computing represents."</description>
+        <description>"This library is a Microsoft effort to support cloud-based client-server communication in native code using a modern asynchronous C++ API design. The C++ REST SDK is a project to start exploring how to best support C++ developers who want to take advantage of the radical shift in software architecture that cloud computing represents."</description>
         <releaseNotes>"Release of C++ Rest SDK 2.3.0 libraries."</releaseNotes>
         <copyright>Copyright 2014</copyright>
         <tags>REST, native, C++, JSON, Casablanca, Http, Uri, WebSockets</tags>
+        
+        <!-- OpenSSL dependency only necessary for Windows Desktop, but unless our package is split into smaller components it is required for all. -->
+        <dependencies>
+          <dependency id="openssl" version="1.0.1.25" />
+        </dependencies>
     </metadata>
     <files>
         <!-- Include header files-->
@@ -24,7 +29,7 @@
         <file src="cpprest.natvis" target="\tools\cpprest.natvis" />
 
         <!-- Including license for WebSocket++ -->
-        <file src="..\libs\websocketpp\COPYING" target="\license\websocketpp" />
+        <file src="..\libs\websocketpp\COPYING" target="\license\websocketpp\COPYING" />
 
         <!-- Debug -->
         <!-- Win32 v140 -->
@@ -145,9 +150,9 @@
         <file src="Binaries\Win32\Release\cpprest120_app_2_3.lib" target="\build\native\lib\Win32\v120\Release\WinRT\cpprest120_app_2_3.lib" />
 
         <!--  Win32 v120_wp81 -->
-        <file src="Binaries\Win32\Release\casablanca120.wp81\cpprest120_wp81_2_3.dll" target="\build\native\bin\Win32\v120_wp81\Release\Phone8\cpprest120_wp81_2_3.dll" />
-        <file src="Binaries\Win32\Release\casablanca120.wp81\cpprest120_wp81_2_3.pdb" target="\build\native\bin\Win32\v120_wp81\Release\Phone8\cpprest120_wp81_2_3.pdb" />
-        <file src="Binaries\Win32\Release\casablanca120.wp81\cpprest120_wp81_2_3.lib" target="\build\native\lib\Win32\v120_wp81\Release\Phone8\cpprest120_wp81_2_3.lib" />
+        <file src="Binaries\Win32\Release\cpprest120_wp81_2_3.dll" target="\build\native\bin\Win32\v120_wp81\Release\Phone8\cpprest120_wp81_2_3.dll" />
+        <file src="Binaries\Win32\Release\cpprest120_wp81_2_3.pdb" target="\build\native\bin\Win32\v120_wp81\Release\Phone8\cpprest120_wp81_2_3.pdb" />
+        <file src="Binaries\Win32\Release\cpprest120_wp81_2_3.lib" target="\build\native\lib\Win32\v120_wp81\Release\Phone8\cpprest120_wp81_2_3.lib" />
 
         <!-- Win32 v120 Phone Silverlight 8.1 -->
         <file src="Binaries\Win32\Release\cpprest120_wps81_2_3.dll" target="\build\native\bin\Win32\v120\Release\Phone8Silverlight\cpprest120_wps81_2_3.dll" />

Release/nuget/cpprestsdk.targets

@@ -4,7 +4,7 @@
     <Linkages-cpprestsdk Condition="'$(Linkages-cpprestsdk)' == ''">dynamic</Linkages-cpprestsdk>
     <CallingConventions-cpprestsdk Condition="'$(CallingConventions-cpprestsdk)' == ''">cdecl</CallingConventions-cpprestsdk>
     <CppRestSDKVersionMajor>2</CppRestSDKVersionMajor>
-    <CppRestSDKVersionMinor>2</CppRestSDKVersionMinor>
+    <CppRestSDKVersionMinor>3</CppRestSDKVersionMinor>
     <CppRestSDKVersionRevision>0</CppRestSDKVersionRevision>
     <CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
   </PropertyGroup>
@@ -57,7 +57,7 @@
     <Link>
       <AdditionalDependencies>$(MSBuildThisFileDirectory)lib\Win32\v140\Release\Desktop\cpprest140_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
-  </ItemDefinitionGrou
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Label="Win32 and v120_wp81 and Release and Phone8" Condition="'$(Platform.ToLower())' == 'win32' And '$(PlatformToolset.ToLower())' == 'v120_wp81' And ( $(Configuration.ToLower().IndexOf('debug')) == -1 )">
     <Link>
       <AdditionalDependencies>$(MSBuildThisFileDirectory)lib\Win32\v120_wp81\Release\Phone8\cpprest120_wp81_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -417,7 +417,7 @@
 
     <!-- Include Websocket++ COPYING license if contained in binaries -->
     <ItemGroup Label="Desktop x64 and Debug" Condition="('$(Platform.ToLower())' == 'x64' Or '$(Platform.ToLower())' == 'win32') And ( !('$(PlatformToolset.ToLower())' == 'windowskernelmodedriver8.0') And !('$(PlatformToolset.ToLower())' == 'windowsapplicationfordrivers8.0') And !('$(PlatformToolset.ToLower())' == 'windowsusermodedriver8.0') And !('$(AppContainerApplication.ToLower())' == 'true') )">
-      <CopyToOutput Include="\license\websocketpp\COPYING" />
+      <CopyToOutput Include="$(MSBuildThisFileDirectory)..\..\license\websocketpp\COPYING" />
     </ItemGroup>
 
     <ItemGroup Label="x64 and v120_xp and Debug and Desktop" Condition="'$(Platform.ToLower())' == 'x64' And '$(PlatformToolset.ToLower())' == 'v120_xp' And ( $(Configuration.ToLower().IndexOf('debug')) &gt; -1 ) And ( !('$(PlatformToolset.ToLower())' == 'windowskernelmodedriver8.0') And !('$(PlatformToolset.ToLower())' == 'windowsapplicationfordrivers8.0') And !('$(PlatformToolset.ToLower())' == 'windowsusermodedriver8.0') And !('$(AppContainerApplication.ToLower())' == 'true') )">
@@ -489,7 +489,7 @@
       <CopyToOutput Include="$(MSBuildThisFileDirectory)bin\Win32\v120_wp81\Release\Phone8\cpprest120_wp81_$(CppRestSDKVersionFileSuffix).pdb" />
       <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)bin\Win32\v120_wp81\Release\Phone8\cpprest120_wp81_$(CppRestSDKVersionFileSuffix).dll" />
     </ItemGroup>
-    <ItemGroup Label="Win32 and v120 and Release and Phone8 Silverlight" Condition="'$(Platform.ToLower())' == 'win32' And '$(PlatformToolset.ToLower())' == 'v120' And ( $(Configuration.ToLower().IndexOf('debug')) == -1 ) And '$(ApplicationType)' == 'Windows Phone Silverlight'"">
+    <ItemGroup Label="Win32 and v120 and Release and Phone8 Silverlight" Condition="'$(Platform.ToLower())' == 'win32' And '$(PlatformToolset.ToLower())' == 'v120' And ( $(Configuration.ToLower().IndexOf('debug')) == -1 ) And '$(ApplicationType)' == 'Windows Phone Silverlight'">
       <CopyToOutput Include="$(MSBuildThisFileDirectory)bin\Win32\v120\Release\Phone8Silverlight\cpprest120_wps81_$(CppRestSDKVersionFileSuffix).dll" />
       <CopyToOutput Include="$(MSBuildThisFileDirectory)bin\Win32\v120\Release\Phone8Silverlight\cpprest120_wps81_$(CppRestSDKVersionFileSuffix).pdb" />
       <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)bin\Win32\v120_wp81\Release\Phone8\cpprest120_wp81_$(CppRestSDKVersionFileSuffix).dll" />
@@ -613,7 +613,7 @@
       <CopyToOutput Include="$(MSBuildThisFileDirectory)bin\Win32\v120_wp81\Debug\Phone8\cpprest120d_wp81_$(CppRestSDKVersionFileSuffix).pdb" />
       <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)bin\Win32\v120_wp81\Debug\Phone8\cpprest120d_wp81_$(CppRestSDKVersionFileSuffix).dll" />
     </ItemGroup>
-    <ItemGroup Label="Win32 and v120 and Debug and Phone8 Silverlight" Condition="'$(Platform.ToLower())' == 'win32' And '$(PlatformToolset.ToLower())' == 'v120' And ( $(Configuration.ToLower().IndexOf('debug')) &gt; -1 ) And '$(ApplicationType)' == 'Windows Phone Silverlight'"">
+    <ItemGroup Label="Win32 and v120 and Debug and Phone8 Silverlight" Condition="'$(Platform.ToLower())' == 'win32' And '$(PlatformToolset.ToLower())' == 'v120' And ( $(Configuration.ToLower().IndexOf('debug')) &gt; -1 ) And '$(ApplicationType)' == 'Windows Phone Silverlight'">
       <CopyToOutput Include="$(MSBuildThisFileDirectory)bin\Win32\v120\Debug\Phone8Silverlight\cpprest120d_wps81_$(CppRestSDKVersionFileSuffix).dll" />
       <CopyToOutput Include="$(MSBuildThisFileDirectory)bin\Win32\v120\Debug\Phone8Silverlight\cpprest120d_wps81_$(CppRestSDKVersionFileSuffix).pdb" />
       <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)bin\Win32\v120\Debug\Phone8Silverlight\cpprest120d_wps81_$(CppRestSDKVersionFileSuffix).dll" />
@@ -655,7 +655,7 @@
       <CopyToOutput Include="$(MSBuildThisFileDirectory)bin\ARM\v120_wp81\Release\Phone8\cpprest120_wp81_$(CppRestSDKVersionFileSuffix).pdb" />
       <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)bin\ARM\v120_wp81\Release\Phone8\cpprest120_wp81_$(CppRestSDKVersionFileSuffix).dll" />
     </ItemGroup>
-    <ItemGroup Label="ARM and v120 and Release and Phone8 Silverlight" Condition="'$(Platform.ToLower())' == 'arm' And '$(PlatformToolset.ToLower())' == 'v120' And ( $(Configuration.ToLower().IndexOf('debug')) == -1 ) And '$(ApplicationType)' == 'Windows Phone Silverlight'"">
+    <ItemGroup Label="ARM and v120 and Release and Phone8 Silverlight" Condition="'$(Platform.ToLower())' == 'arm' And '$(PlatformToolset.ToLower())' == 'v120' And ( $(Configuration.ToLower().IndexOf('debug')) == -1 ) And '$(ApplicationType)' == 'Windows Phone Silverlight'">
       <CopyToOutput Include="$(MSBuildThisFileDirectory)bin\ARM\v120\Release\Phone8Silverlight\cpprest120_wps81_$(CppRestSDKVersionFileSuffix).dll" />
       <CopyToOutput Include="$(MSBuildThisFileDirectory)bin\ARM\v120\Release\Phone8Silverlight\cpprest120_wps81_$(CppRestSDKVersionFileSuffix).pdb" />
       <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)bin\ARM\v120\Release\Phone8Silverlight\cpprest120_wps81_$(CppRestSDKVersionFileSuffix).dll" />
@@ -697,7 +697,7 @@
       <CopyToOutput Include="$(MSBuildThisFileDirectory)bin\ARM\v120_wp81\Debug\Phone8\cpprest120d_wp81_$(CppRestSDKVersionFileSuffix).pdb" />
       <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)bin\ARM\v120_wp81\Debug\Phone8\cpprest120d_wp81_$(CppRestSDKVersionFileSuffix).dll" />
     </ItemGroup>
-    <ItemGroup Label="ARM and v120 and Debug and Phone8 Silverlight" Condition="'$(Platform.ToLower())' == 'arm' And '$(PlatformToolset.ToLower())' == 'v120' And ( $(Configuration.ToLower().IndexOf('debug')) &gt; -1 ) And '$(ApplicationType)' == 'Windows Phone Silverlight'"">
+    <ItemGroup Label="ARM and v120 and Debug and Phone8 Silverlight" Condition="'$(Platform.ToLower())' == 'arm' And '$(PlatformToolset.ToLower())' == 'v120' And ( $(Configuration.ToLower().IndexOf('debug')) &gt; -1 ) And '$(ApplicationType)' == 'Windows Phone Silverlight'">
       <CopyToOutput Include="$(MSBuildThisFileDirectory)bin\ARM\v120\Debug\Phone8Silverlight\cpprest120d_wps81_$(CppRestSDKVersionFileSuffix).dll" />
       <CopyToOutput Include="$(MSBuildThisFileDirectory)bin\ARM\v120\Debug\Phone8Silverlight\cpprest120d_wps81_$(CppRestSDKVersionFileSuffix).pdb" />
       <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)bin\ARM\v120\Debug\Phone8Silverlight\cpprest120d_wps81_$(CppRestSDKVersionFileSuffix).dll" />

Release/nuget/update.ps1

@@ -4,8 +4,8 @@ Param(
 )
 
 Write-Host  "Copying Binaries folder"
-Get-Item ..\..\Binaries\ | Copy-Item -Destination .\Binaries -rescure
-Get-Item ..\include\ | Copy-Item -Destination .\include -rescure
+Get-Item ..\..\Binaries\ | Copy-Item -Destination .\Binaries -recurse
+Get-Item ..\include\ | Copy-Item -Destination .\include -recurse
 
 Write-Host "Updating the cpprestsdk.nuspec version number"
 (Get-Content .\cpprestsdk.nuspec) | ForEach-Object {$_ -replace $OldVer, $NewVer} | Set-Content .\cpprestsdk.nuspec