diff options
| author | Jose <jose@zeroc.com> | 2020-12-01 14:50:47 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2020-12-01 14:50:47 +0100 |
| commit | 65b94c7fc56dd0a0fe1a9b5b24dec64e4d1a2e0a (patch) | |
| tree | 5376c11f3be2fc0e1c187b6bbe3fb812c1e33e44 /csharp | |
| parent | .NET5.0 build fixes (diff) | |
| download | ice-65b94c7fc56dd0a0fe1a9b5b24dec64e4d1a2e0a.tar.bz2 ice-65b94c7fc56dd0a0fe1a9b5b24dec64e4d1a2e0a.tar.xz ice-65b94c7fc56dd0a0fe1a9b5b24dec64e4d1a2e0a.zip | |
.NET NuGet package build fixes
Diffstat (limited to 'csharp')
| -rw-r--r-- | csharp/msbuild/ice.proj | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/csharp/msbuild/ice.proj b/csharp/msbuild/ice.proj index 4d0ab3d8684..50d968acc43 100644 --- a/csharp/msbuild/ice.proj +++ b/csharp/msbuild/ice.proj @@ -348,22 +348,22 @@ <!-- Copy bzip2 native dll next to iceboxnet assemblies --> <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v140.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.dll; $(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v140.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.pdb" - DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\net45"/> + DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\net5.0" + Condition="'$(Net5Targets)' == 'true' and '$(VisualStudioVersion)' == '16.0'"/> <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v140.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.dll; $(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v140.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.pdb" - DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\netcoreapp2.1" - Condition="'$(NetStandardTargets)' == 'true'"/> + DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\netcoreapp3.1" + Condition="'$(NetStandardTargets)' == 'true' and '$(VisualStudioVersion)' == '16.0'"/> <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v140.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.dll; $(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v140.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.pdb" - DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\net5" - Condition="'$(Net5Targets)' == 'true' and '$(VisualStudioVersion)' == '16.0'"/> + DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\net45"/> <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v140.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.dll; $(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v140.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.pdb" - DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\netcoreapp3.1" - Condition="'$(NetStandardTargets)' == 'true' and '$(VisualStudioVersion)' == '16.0'"/> + DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\netcoreapp2.1" + Condition="'$(NetStandardTargets)' == 'true'"/> <Copy SourceFiles="zeroc.ice.net.props" DestinationFiles="zeroc.ice.net\build\zeroc.ice.net.props"/> |