diff options
| -rw-r--r-- | csharp/msbuild/ice.nuget.targets | 22 | ||||
| -rw-r--r-- | csharp/msbuild/ice.proj | 14 | ||||
| -rw-r--r-- | csharp/msbuild/zeroc.ice.net.nuspec | 4 | ||||
| -rw-r--r-- | csharp/msbuild/zeroc.ice.net.props | 4 |
4 files changed, 37 insertions, 7 deletions
diff --git a/csharp/msbuild/ice.nuget.targets b/csharp/msbuild/ice.nuget.targets new file mode 100644 index 00000000000..adc532f81db --- /dev/null +++ b/csharp/msbuild/ice.nuget.targets @@ -0,0 +1,22 @@ +<Project DefaultTargets="NugetPack" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Ice_SrcRootDir>$(MSBuildThisFileDirectory)..\</Ice_SrcRootDir> + </PropertyGroup> + + <!-- For CSharp we use Slice compiler from Win32 Release builds --> + <ItemGroup> + <Executables Include="$(Ice_SrcRootDir)..\cpp\bin\Win32\Release\slice2cs.exe"/> + </ItemGroup> + + <!-- public header files and sources --> + <ItemGroup> + <Assemblies Include="$(Ice_SrcRootDir)Assemblies\*.dll"/> + <Assemblies Include="$(Ice_SrcRootDir)Assemblies\*.xml"/> + </ItemGroup> + + <!-- Copy required files to the package specific directories --> + <Target Name="NugetPack"> + <Copy SourceFiles="@(Executables)" DestinationFolder="$(PackageDirectory)\build\native\bin\Win32\Release" /> + <Copy SourceFiles="@(Assemblies)" DestinationFolder="$(PackageDirectory)\lib" /> + </Target> +</Project> diff --git a/csharp/msbuild/ice.proj b/csharp/msbuild/ice.proj index bcabc5e80b0..d70fa1a0db9 100644 --- a/csharp/msbuild/ice.proj +++ b/csharp/msbuild/ice.proj @@ -30,19 +30,27 @@ Targets="Clean" /> </Target> - <!-- Build all the test solution configurations --> <Target Name="Build" DependsOnTargets="BuildDist"> <MSBuild Projects="@(TestSoution)" BuildInParallel="true" Properties="%(Properties)" /> </Target> - <!-- Clean all the test solution configurations --> <Target Name="Clean" DependsOnTargets="CleanDist"> <MSBuild Projects="@(TestSoution)" BuildInParallel="true" Targets="Clean" Properties="%(Properties)" /> </Target> <Target Name="NugetPack" DependsOnTargets="BuildDist"> - <MSBuild Projects="ice.nuget.targets" Properties="NugetExe=$(NugetExe)"/> + <MSBuild Projects="ice.nuget.targets" + Properties="PackageDirectory=zeroc.ice.net"/> + + <Copy SourceFiles="zeroc.ice.net.nuspec" + DestinationFolder="zeroc.ice.net" /> + + <Copy SourceFiles="zeroc.ice.net.props" + DestinationFiles="zeroc.ice.net\build\zeroc.ice.net.props" /> + + <Exec Command="$(NugetExe) pack -NoPackageAnalysis -NonInteractive" + WorkingDirectory="zeroc.ice.net"/> </Target> </Project> diff --git a/csharp/msbuild/zeroc.ice.net.nuspec b/csharp/msbuild/zeroc.ice.net.nuspec index 1233ac1f7a7..56d049324eb 100644 --- a/csharp/msbuild/zeroc.ice.net.nuspec +++ b/csharp/msbuild/zeroc.ice.net.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.net</id> <title>ZeroC Ice for .NET</title> - <version>3.7.0.0</version> + <version>3.7.0-alpha3</version> <authors>ZeroC, Inc</authors> <owners>ZeroC, Inc</owners> <licenseUrl>https://zeroc.com/licensing</licenseUrl> @@ -12,7 +12,7 @@ <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>A comprehensive rpc framework.</description> <releaseNotes>https://doc.zeroc.com/display/Ice37/Ice+Release+Notes</releaseNotes> - <tags>ice native</tags> + <tags>ice</tags> <references> <reference file="Ice.dll" /> </references> diff --git a/csharp/msbuild/zeroc.ice.net.props b/csharp/msbuild/zeroc.ice.net.props index 0a694837e3c..c5bd0e560bd 100644 --- a/csharp/msbuild/zeroc.ice.net.props +++ b/csharp/msbuild/zeroc.ice.net.props @@ -7,8 +7,8 @@ <IceVersionMM>3.7</IceVersionMM> <IceSoVersion>37a3</IceSoVersion> <IceNugetPackageVersion>3.7.53.0</IceNugetPackageVersion> - <IceHome>$(MSBuildThisFileDirectory)..</IceHome> - <IceToolsPath>$(IceHome)\tools</IceToolsPath> + <IceHome>$(MSBuildThisFileDirectory)</IceHome> + <IceToolsPath>$(IceHome)\build\native\Win32\Release</IceToolsPath> <IceAssembliesDir>$(IceHome)\lib</IceAssembliesDir> </PropertyGroup> </Project> |