diff options
| author | Jose <jose@zeroc.com> | 2017-12-14 22:08:37 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-12-14 22:08:37 +0100 |
| commit | 07121cf39d5dc04d563131e9df1afff76adaecb0 (patch) | |
| tree | 8f1cea1d5bf44c911d51f3af619de712d8b3590f /csharp/test/Ice/proxy | |
| parent | Merge remote-tracking branch 'origin/3.7' into netcore (diff) | |
| download | ice-07121cf39d5dc04d563131e9df1afff76adaecb0.tar.bz2 ice-07121cf39d5dc04d563131e9df1afff76adaecb0.tar.xz ice-07121cf39d5dc04d563131e9df1afff76adaecb0.zip | |
3.7.1 version updates
Diffstat (limited to 'csharp/test/Ice/proxy')
8 files changed, 16 insertions, 16 deletions
diff --git a/csharp/test/Ice/proxy/msbuild/client/net45/client.csproj b/csharp/test/Ice/proxy/msbuild/client/net45/client.csproj index d50e6b2902c..7394024a669 100644 --- a/csharp/test/Ice/proxy/msbuild/client/net45/client.csproj +++ b/csharp/test/Ice/proxy/msbuild/client/net45/client.csproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props"/> + <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/> <PropertyGroup Label="Globals"> <NuGetPackageImportStamp/> <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir> @@ -22,7 +22,7 @@ <DebugSymbols>true</DebugSymbols> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.7.0.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL"> <HintPath>$(IceAssembliesDir)\Ice.dll</HintPath> <SpecificVersion>False</SpecificVersion> <Private>False</Private> @@ -70,6 +70,6 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/> </Target> </Project> diff --git a/csharp/test/Ice/proxy/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/proxy/msbuild/client/netstandard2.0/client.csproj index d2ea3e5fca6..af154c2e53f 100644 --- a/csharp/test/Ice/proxy/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/proxy/msbuild/client/netstandard2.0/client.csproj @@ -19,7 +19,7 @@ <!--Using Ice NuGet package--> <When Condition="'$(ICE_BIN_DIST)' == 'all'"> <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.0"/> + <PackageReference Include="zeroc.ice.net" Version="3.7.1"/> </ItemGroup> </When> <!--Using Ice built from source--> diff --git a/csharp/test/Ice/proxy/msbuild/collocated/net45/collocated.csproj b/csharp/test/Ice/proxy/msbuild/collocated/net45/collocated.csproj index 366296625a1..3d29e3507c6 100644 --- a/csharp/test/Ice/proxy/msbuild/collocated/net45/collocated.csproj +++ b/csharp/test/Ice/proxy/msbuild/collocated/net45/collocated.csproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props"/> + <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/> <PropertyGroup Label="Globals"> <NuGetPackageImportStamp/> <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir> @@ -22,7 +22,7 @@ <DebugSymbols>true</DebugSymbols> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.7.0.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL"> <HintPath>$(IceAssembliesDir)\Ice.dll</HintPath> <SpecificVersion>False</SpecificVersion> <Private>False</Private> @@ -85,6 +85,6 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/> </Target> </Project> diff --git a/csharp/test/Ice/proxy/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/proxy/msbuild/collocated/netstandard2.0/collocated.csproj index 74225643571..8254a902705 100644 --- a/csharp/test/Ice/proxy/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/proxy/msbuild/collocated/netstandard2.0/collocated.csproj @@ -20,7 +20,7 @@ <!--Using Ice NuGet package--> <When Condition="'$(ICE_BIN_DIST)' == 'all'"> <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.0"/> + <PackageReference Include="zeroc.ice.net" Version="3.7.1"/> </ItemGroup> </When> <!--Using Ice built from source--> diff --git a/csharp/test/Ice/proxy/msbuild/server/net45/server.csproj b/csharp/test/Ice/proxy/msbuild/server/net45/server.csproj index dfe05215319..a66c0c83ef8 100644 --- a/csharp/test/Ice/proxy/msbuild/server/net45/server.csproj +++ b/csharp/test/Ice/proxy/msbuild/server/net45/server.csproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props"/> + <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/> <PropertyGroup Label="Globals"> <NuGetPackageImportStamp/> <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir> @@ -22,7 +22,7 @@ <DebugSymbols>true</DebugSymbols> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.7.0.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL"> <HintPath>$(IceAssembliesDir)\Ice.dll</HintPath> <SpecificVersion>False</SpecificVersion> <Private>False</Private> @@ -70,6 +70,6 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/> </Target> </Project> diff --git a/csharp/test/Ice/proxy/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/proxy/msbuild/server/netstandard2.0/server.csproj index d44e0ee9726..c82fb29130c 100644 --- a/csharp/test/Ice/proxy/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/proxy/msbuild/server/netstandard2.0/server.csproj @@ -19,7 +19,7 @@ <!--Using Ice NuGet package--> <When Condition="'$(ICE_BIN_DIST)' == 'all'"> <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.0"/> + <PackageReference Include="zeroc.ice.net" Version="3.7.1"/> </ItemGroup> </When> <!--Using Ice built from source--> diff --git a/csharp/test/Ice/proxy/msbuild/serveramd/net45/serveramd.csproj b/csharp/test/Ice/proxy/msbuild/serveramd/net45/serveramd.csproj index 2432bf9df9d..309d575fc41 100644 --- a/csharp/test/Ice/proxy/msbuild/serveramd/net45/serveramd.csproj +++ b/csharp/test/Ice/proxy/msbuild/serveramd/net45/serveramd.csproj @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props"/> + <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/> <PropertyGroup Label="Globals"> <NuGetPackageImportStamp/> <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir> @@ -22,7 +22,7 @@ <DebugSymbols>true</DebugSymbols> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.7.0.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL"> <HintPath>$(IceAssembliesDir)\Ice.dll</HintPath> <SpecificVersion>False</SpecificVersion> <Private>False</Private> @@ -70,6 +70,6 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.0\build\zeroc.ice.net.props'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/> </Target> </Project> diff --git a/csharp/test/Ice/proxy/msbuild/serveramd/netstandard2.0/serveramd.csproj b/csharp/test/Ice/proxy/msbuild/serveramd/netstandard2.0/serveramd.csproj index c6570a3c796..1099e896f6b 100644 --- a/csharp/test/Ice/proxy/msbuild/serveramd/netstandard2.0/serveramd.csproj +++ b/csharp/test/Ice/proxy/msbuild/serveramd/netstandard2.0/serveramd.csproj @@ -19,7 +19,7 @@ <!--Using Ice NuGet package--> <When Condition="'$(ICE_BIN_DIST)' == 'all'"> <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.0"/> + <PackageReference Include="zeroc.ice.net" Version="3.7.1"/> </ItemGroup> </When> <!--Using Ice built from source--> |