NuGet package build fixes

20 files changed, 22 insertions, 51 deletions

diff --git a/cpp/msbuild/ice.proj b/cpp/msbuild/ice.proj
index d5f217ba2d0..bec650f5c18 100644
--- a/cpp/msbuild/ice.proj
+++ b/cpp/msbuild/ice.proj
@@ -305,6 +305,8 @@
               DestinationFiles="zeroc.ice.$(DefaultPlatformToolset)\ICE_LICENSE.txt" />
         <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\LICENSE"
               DestinationFiles="zeroc.ice.$(DefaultPlatformToolset)\LICENSE.txt" />
+        <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\logo.png"
+              DestinationFiles="zeroc.ice.$(DefaultPlatformToolset)\logo.png" />
         <Copy SourceFiles="zeroc.ice.$(DefaultPlatformToolset).nuspec"
               DestinationFolder="zeroc.ice.$(DefaultPlatformToolset)" />
         <Copy SourceFiles="zeroc.ice.$(DefaultPlatformToolset).props"
diff --git a/cpp/msbuild/zeroc.ice.uwp.v140.nuspec b/cpp/msbuild/zeroc.ice.uwp.v140.nuspec
index add5dc324fb..da512bffd87 100644
--- a/cpp/msbuild/zeroc.ice.uwp.v140.nuspec
+++ b/cpp/msbuild/zeroc.ice.uwp.v140.nuspec
@@ -8,7 +8,7 @@
     <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
     <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-    <icon>images\logo.png</icon>
+    <icon>logo.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Ice C++/CX SDK for Visual Studio 2015 (v140). Provides binaries for Universal Windows (UWP) x86 and x64. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
     <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>
@@ -18,7 +18,4 @@
       <dependency id="zeroc.ice.uwp.v140.x64" version="[3.7.4]"/>
     </dependencies>
   </metadata>
-  <files>
-    <file src="..\logo.png" target="images\"/>
-  </files>
 </package>
diff --git a/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec b/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec
index d7165825fc4..ef8b6955f42 100644
--- a/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec
+++ b/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec
@@ -8,13 +8,10 @@
     <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
     <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-    <icon>images\logo.png</icon>
+    <icon>logo.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>x64 subset of the Ice C++/CX SDK. Installed by zeroc.ice.uwp.v140.</description>
     <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>
     <tags>ice native rpc uwp v140 x64 zeroc</tags>
   </metadata>
-  <files>
-    <file src="..\logo.png" target="images\"/>
-  </files>
 </package>
diff --git a/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec b/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec
index c18d3997ae0..7128c43f021 100644
--- a/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec
+++ b/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec
@@ -8,13 +8,10 @@
     <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
     <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-    <icon>images\logo.png</icon>
+    <icon>logo.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>x86 subset of the Ice C++/CX SDK. Installed by zeroc.ice.uwp.v140.</description>
     <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>
     <tags>ice native rpc uwp v140 x86 zeroc</tags>
   </metadata>
-  <files>
-    <file src="..\logo.png" target="images\"/>
-  </files>
 </package>
diff --git a/cpp/msbuild/zeroc.ice.uwp.v141.nuspec b/cpp/msbuild/zeroc.ice.uwp.v141.nuspec
index 9e9ced8e5c1..37b13d1299e 100644
--- a/cpp/msbuild/zeroc.ice.uwp.v141.nuspec
+++ b/cpp/msbuild/zeroc.ice.uwp.v141.nuspec
@@ -8,7 +8,7 @@
     <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
     <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-    <icon>images\logo.png</icon>
+    <icon>logo.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Ice C++/CX SDK for Visual Studio 2017 (v141). Provides binaries for Universal Windows (UWP) x86 and x64. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
     <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>
@@ -18,7 +18,4 @@
       <dependency id="zeroc.ice.uwp.v141.x64" version="[3.7.4]"/>
     </dependencies>
   </metadata>
-  <files>
-    <file src="..\logo.png" target="images\"/>
-  </files>
 </package>
diff --git a/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec b/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec
index c73bdb58c25..9940d2dfcc1 100644
--- a/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec
+++ b/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec
@@ -8,13 +8,10 @@
     <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
     <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-    <icon>images\logo.png</icon>
+    <icon>logo.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>x64 subset of the Ice C++/CX SDK. Installed by zeroc.ice.uwp.v141.</description>
     <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>
     <tags>ice native rpc uwp v141 x64 zeroc</tags>
   </metadata>
-  <files>
-    <file src="..\logo.png" target="images\"/>
-  </files>
 </package>
diff --git a/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec b/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec
index 812f677d1bf..481003b7963 100644
--- a/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec
+++ b/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec
@@ -8,13 +8,10 @@
     <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
     <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-    <icon>images\logo.png</icon>
+    <icon>logo.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>x86 subset of the Ice C++/CX SDK. Installed by zeroc.ice.uwp.v141.</description>
     <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>
     <tags>ice native rpc uwp v141 x86 zeroc</tags>
   </metadata>
-  <files>
-    <file src="..\logo.png" target="images\"/>
-  </files>
 </package>
diff --git a/cpp/msbuild/zeroc.ice.v100.nuspec b/cpp/msbuild/zeroc.ice.v100.nuspec
index 31237d1dafb..4ff63bcf583 100644
--- a/cpp/msbuild/zeroc.ice.v100.nuspec
+++ b/cpp/msbuild/zeroc.ice.v100.nuspec
@@ -8,13 +8,10 @@
     <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
     <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-    <icon>images\logo.png</icon>
+    <icon>logo.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Ice C++ SDK for Visual Studio 2010 (v100). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
     <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>
     <tags>ice native rpc v100 zeroc</tags>
   </metadata>
-  <files>
-    <file src="..\logo.png" target="images\"/>
-  </files>
 </package>
diff --git a/cpp/msbuild/zeroc.ice.v120.nuspec b/cpp/msbuild/zeroc.ice.v120.nuspec
index 011eece96ec..41633fc6be2 100644
--- a/cpp/msbuild/zeroc.ice.v120.nuspec
+++ b/cpp/msbuild/zeroc.ice.v120.nuspec
@@ -8,13 +8,10 @@
     <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
     <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-    <icon>images\logo.png</icon>
+    <icon>logo.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Ice C++ SDK for Visual Studio 2013 (v120). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
     <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>
     <tags>ice native rpc v120 zeroc</tags>
   </metadata>
-  <files>
-    <file src="..\logo.png" target="images\"/>
-  </files>
 </package>
diff --git a/cpp/msbuild/zeroc.ice.v140.nuspec b/cpp/msbuild/zeroc.ice.v140.nuspec
index 084557a38c1..d053922eb6a 100644
--- a/cpp/msbuild/zeroc.ice.v140.nuspec
+++ b/cpp/msbuild/zeroc.ice.v140.nuspec
@@ -8,13 +8,10 @@
     <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
     <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-    <icon>images\logo.png</icon>
+    <icon>logo.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Ice C++ SDK for Visual Studio 2015 (v140). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
     <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>
     <tags>ice native rpc v140 zeroc</tags>
   </metadata>
-  <files>
-    <file src="..\logo.png" target="images\"/>
-  </files>
 </package>
diff --git a/cpp/msbuild/zeroc.ice.v141.nuspec b/cpp/msbuild/zeroc.ice.v141.nuspec
index 8ca25ae0ae9..0c0742a22df 100644
--- a/cpp/msbuild/zeroc.ice.v141.nuspec
+++ b/cpp/msbuild/zeroc.ice.v141.nuspec
@@ -8,13 +8,10 @@
     <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
     <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-    <icon>images\logo.png</icon>
+    <icon>logo.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Ice C++ SDK for Visual Studio 2017 (v141). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
     <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>
     <tags>ice native rpc v141 zeroc</tags>
   </metadata>
-  <files>
-    <file src="..\logo.png" target="images\"/>
-  </files>
 </package>
diff --git a/cpp/msbuild/zeroc.ice.v142.nuspec b/cpp/msbuild/zeroc.ice.v142.nuspec
index 75c4a42d832..1e5d7575e0f 100644
--- a/cpp/msbuild/zeroc.ice.v142.nuspec
+++ b/cpp/msbuild/zeroc.ice.v142.nuspec
@@ -8,13 +8,10 @@
     <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
     <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-    <icon>images\logo.png</icon>
+    <icon>logo.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Ice C++ SDK for Visual Studio 2019 (v142). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
     <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>
     <tags>ice native rpc v141 zeroc</tags>
   </metadata>
-  <files>
-    <file src="..\logo.png" target="images\"/>
-  </files>
 </package>
diff --git a/csharp/msbuild/ice.proj b/csharp/msbuild/ice.proj
index ef758af8617..49f6f99b969 100644
--- a/csharp/msbuild/ice.proj
+++ b/csharp/msbuild/ice.proj
@@ -254,6 +254,9 @@
         <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\LICENSE"
               DestinationFiles="zeroc.ice.net\LICENSE.txt" />
 
+        <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\logo.png"
+              DestinationFiles="zeroc.ice.net\logo.png" />
+
         <!-- Generate iceboxnet.exe.config with the correct assembly pulbic key token and assembly paths -->
         <GetPublicKeyToken AssemblyFile="$(MSBuildThisFileDirectory)..\lib\net45\Ice.dll">
             <Output TaskParameter="PublicKeyToken" PropertyName="PublicKeyToken"/>
diff --git a/csharp/msbuild/logo.png b/csharp/msbuild/logo.png
deleted file mode 100644
index 8303feb2dcd..00000000000
--- a/csharp/msbuild/logo.png
+++ /dev/null
diff --git a/csharp/msbuild/zeroc.ice.net.nuspec b/csharp/msbuild/zeroc.ice.net.nuspec
index 0fd811463ce..43ada3d7913 100644
--- a/csharp/msbuild/zeroc.ice.net.nuspec
+++ b/csharp/msbuild/zeroc.ice.net.nuspec
@@ -8,13 +8,11 @@
         <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
         <license type="expression">GPL-2.0-only</license>
         <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-        <icon>images\logo.png</icon>
+        <icon>logo.png</icon>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Ice C#/.NET SDK. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
         <releaseNotes>https://doc.zeroc.com/rel/ice-releases/ice-3-7/ice-3-7-4-release-notes</releaseNotes>
         <tags>ice</tags>
     </metadata>
-    <files>
-      <file src="..\logo.png" target="images\"/>
-    </files>
 </package>
+
diff --git a/cpp/msbuild/logo.png b/logo.png
index 8303feb2dcd..8303feb2dcd 100644
--- a/cpp/msbuild/logo.png
+++ b/logo.png
diff --git a/php/msbuild/ice.nugetpack.targets b/php/msbuild/ice.nugetpack.targets
index aaa72fa611a..59633112f37 100644
--- a/php/msbuild/ice.nugetpack.targets
+++ b/php/msbuild/ice.nugetpack.targets
@@ -11,6 +11,7 @@
 
         <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\ICE_LICENSE" DestinationFiles="$(PackageName)\ICE_LICENSE.txt" />
         <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\LICENSE" DestinationFiles="$(PackageName)\LICENSE.txt" />
+        <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\logo.png" DestinationFiles="$(PackageName)\logo.png" />
 
         <Exec Command="$(NuGetExe) pack -NoPackageAnalysis -NonInteractive" WorkingDirectory="$(PackageName)"/>
     </Target>
diff --git a/php/msbuild/zeroc.ice.php7.1.nuspec b/php/msbuild/zeroc.ice.php7.1.nuspec
index c29cc6ec53a..9047085f235 100644
--- a/php/msbuild/zeroc.ice.php7.1.nuspec
+++ b/php/msbuild/zeroc.ice.php7.1.nuspec
@@ -8,7 +8,7 @@
         <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
         <license type="expression">GPL-2.0-only</license>
         <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-        <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
+        <icon>logo.png</icon>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Ice for PHP SDK. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
         <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>
diff --git a/php/msbuild/zeroc.ice.php7.2.nuspec b/php/msbuild/zeroc.ice.php7.2.nuspec
index 929aef06e58..4fc6fdf5274 100644
--- a/php/msbuild/zeroc.ice.php7.2.nuspec
+++ b/php/msbuild/zeroc.ice.php7.2.nuspec
@@ -8,7 +8,7 @@
         <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
         <license type="expression">GPL-2.0-only</license>
         <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-        <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
+        <icon>logo.png</icon>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Ice for PHP SDK. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
         <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>
diff --git a/php/msbuild/zeroc.ice.php7.3.nuspec b/php/msbuild/zeroc.ice.php7.3.nuspec
index 10a7fcb3e16..20b9fd51a8f 100644
--- a/php/msbuild/zeroc.ice.php7.3.nuspec
+++ b/php/msbuild/zeroc.ice.php7.3.nuspec
@@ -8,7 +8,7 @@
         <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
         <license type="expression">GPL-2.0-only</license>
         <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
-        <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
+        <icon>logo.png</icon>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Ice for PHP SDK. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
         <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes>