diff options
| author | Jose <jose@zeroc.com> | 2017-07-17 10:12:39 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-07-17 10:12:39 +0200 |
| commit | 6e3642715fb69f27b4a7c6c09470cbb5b8744c05 (patch) | |
| tree | 1413f36860c3af0d149e6b90529a829b7fe5beb5 | |
| parent | Fixed Ice.MessageSizeMax value in Ice/timeout tests (diff) | |
| download | ice-6e3642715fb69f27b4a7c6c09470cbb5b8744c05.tar.bz2 ice-6e3642715fb69f27b4a7c6c09470cbb5b8744c05.tar.xz ice-6e3642715fb69f27b4a7c6c09470cbb5b8744c05.zip | |
ICE-8336 - License files missing from NuGet packages
| -rw-r--r-- | cpp/msbuild/ice.proj | 16 | ||||
| -rw-r--r-- | csharp/msbuild/ice.proj | 5 |
2 files changed, 21 insertions, 0 deletions
diff --git a/cpp/msbuild/ice.proj b/cpp/msbuild/ice.proj index bfd4a7759dd..a1d42072f35 100644 --- a/cpp/msbuild/ice.proj +++ b/cpp/msbuild/ice.proj @@ -284,6 +284,10 @@ <MSBuild Projects="ice.nuget.targets" Properties="Configuration=Release;Platform=x64;PackageDirectory=zeroc.ice.$(DefaultPlatformToolset)" /> + <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\ICE_LICENSE" + DestinationFiles="zeroc.ice.$(DefaultPlatformToolset)\ICE_LICENSE.txt" /> + <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\LICENSE" + DestinationFiles="zeroc.ice.$(DefaultPlatformToolset)\LICENSE.txt" /> <Copy SourceFiles="zeroc.ice.$(DefaultPlatformToolset).nuspec" DestinationFolder="zeroc.ice.$(DefaultPlatformToolset)" /> <Copy SourceFiles="zeroc.ice.$(DefaultPlatformToolset).props" @@ -345,6 +349,10 @@ Properties="Configuration=Debug;Platform=Win32;PackageDirectory=zeroc.ice.uwp.$(DefaultPlatformToolset).x86" /> <MSBuild Projects="ice.nuget.uwp.arch.targets" Properties="Configuration=Release;Platform=Win32;PackageDirectory=zeroc.ice.uwp.$(DefaultPlatformToolset).x86" /> + <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\ICE_LICENSE" + DestinationFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).x86\ICE_LICENSE.txt" /> + <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\LICENSE" + DestinationFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).x86\LICENSE.txt" /> <Copy SourceFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).x86.nuspec" DestinationFolder="zeroc.ice.uwp.$(DefaultPlatformToolset).x86" /> <Copy SourceFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).targets" @@ -357,6 +365,10 @@ Properties="Configuration=Debug;Platform=x64;PackageDirectory=zeroc.ice.uwp.$(DefaultPlatformToolset).x64" /> <MSBuild Projects="ice.nuget.uwp.arch.targets" Properties="Configuration=Release;Platform=x64;PackageDirectory=zeroc.ice.uwp.$(DefaultPlatformToolset).x64" /> + <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\ICE_LICENSE" + DestinationFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).x64\ICE_LICENSE.txt" /> + <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\LICENSE" + DestinationFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).x64\LICENSE.txt" /> <Copy SourceFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).x64.nuspec" DestinationFolder="zeroc.ice.uwp.$(DefaultPlatformToolset).x64" /> <Copy SourceFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).targets" @@ -367,6 +379,10 @@ <!-- noarch package --> <MSBuild Projects="ice.nuget.uwp.targets" Properties="PackageDirectory=zeroc.ice.uwp.$(DefaultPlatformToolset)" /> + <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\ICE_LICENSE" + DestinationFiles="zeroc.ice.uwp.$(DefaultPlatformToolset)\ICE_LICENSE.txt" /> + <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\LICENSE" + DestinationFiles="zeroc.ice.uwp.$(DefaultPlatformToolset)\LICENSE.txt" /> <Copy SourceFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).nuspec" DestinationFolder="zeroc.ice.uwp.$(DefaultPlatformToolset)" /> <Copy SourceFiles="zeroc.ice.uwp.$(DefaultPlatformToolset).props" diff --git a/csharp/msbuild/ice.proj b/csharp/msbuild/ice.proj index 04bb58edd6f..87b3f9ccc57 100644 --- a/csharp/msbuild/ice.proj +++ b/csharp/msbuild/ice.proj @@ -75,6 +75,11 @@ <Copy SourceFiles="zeroc.ice.net.nuspec" DestinationFolder="zeroc.ice.net" /> + <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\ICE_LICENSE" + DestinationFiles="zeroc.ice.net\ICE_LICENSE.txt" /> + <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\LICENSE" + DestinationFiles="zeroc.ice.net\LICENSE.txt" /> + <!-- Generate iceboxnet.exe.config with the correct assembly pulbic key token and assembly paths --> <GetPublicKeyToken AssemblyFile="$(MSBuildThisFileDirectory)..\Assemblies\Ice.dll"> <Output TaskParameter="PublicKeyToken" PropertyName="PublicKeyToken"/> |