summaryrefslogtreecommitdiff
path: root/csharp/test/Ice/timeout
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2021-02-15 09:51:16 -0500
committerJoe George <joe@zeroc.com>2021-02-15 09:51:16 -0500
commit38cecfcf83521167b5db553da1c05612d88923cb (patch)
tree315efc136af6ba7550ea5894cdb185858aac3b8e /csharp/test/Ice/timeout
parentSupport for Ruby 3.0 (Fixes #1257) (#1258) (diff)
downloadice-38cecfcf83521167b5db553da1c05612d88923cb.tar.bz2
ice-38cecfcf83521167b5db553da1c05612d88923cb.tar.xz
ice-38cecfcf83521167b5db553da1c05612d88923cb.zip
Update version to v3.8.0
Diffstat (limited to 'csharp/test/Ice/timeout')
-rw-r--r--csharp/test/Ice/timeout/msbuild/client/net45/client.csproj6
-rw-r--r--csharp/test/Ice/timeout/msbuild/client/net45/packages.config2
-rw-r--r--csharp/test/Ice/timeout/msbuild/client/net5.0/client.csproj2
-rw-r--r--csharp/test/Ice/timeout/msbuild/client/netstandard2.0/client.csproj2
-rw-r--r--csharp/test/Ice/timeout/msbuild/server/net45/packages.config2
-rw-r--r--csharp/test/Ice/timeout/msbuild/server/net45/server.csproj6
-rw-r--r--csharp/test/Ice/timeout/msbuild/server/net5.0/server.csproj2
-rw-r--r--csharp/test/Ice/timeout/msbuild/server/netstandard2.0/server.csproj2
-rw-r--r--csharp/test/Ice/timeout/msbuild/test/netstandard2.0/test.csproj2
9 files changed, 13 insertions, 13 deletions
diff --git a/csharp/test/Ice/timeout/msbuild/client/net45/client.csproj b/csharp/test/Ice/timeout/msbuild/client/net45/client.csproj
index b0023679dfb..917259969f8 100644
--- a/csharp/test/Ice/timeout/msbuild/client/net45/client.csproj
+++ b/csharp/test/Ice/timeout/msbuild/client/net45/client.csproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
<Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" />
- <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props" />
+ <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.8.0\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.8.0\build\zeroc.ice.net.props" />
<PropertyGroup Label="Globals">
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
@@ -21,7 +21,7 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.7.5.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.8.0.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
<HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
@@ -61,7 +61,7 @@
<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.5\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.8.0\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.8.0\build\zeroc.ice.net.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" />
</Target>
diff --git a/csharp/test/Ice/timeout/msbuild/client/net45/packages.config b/csharp/test/Ice/timeout/msbuild/client/net45/packages.config
index 7f20c0c71e3..e71444c80e6 100644
--- a/csharp/test/Ice/timeout/msbuild/client/net45/packages.config
+++ b/csharp/test/Ice/timeout/msbuild/client/net45/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="zeroc.ice.net" version="3.7.5" targetFramework="net452" />
+ <package id="zeroc.ice.net" version="3.8.0" targetFramework="net452" />
<package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="net451" />
</packages> \ No newline at end of file
diff --git a/csharp/test/Ice/timeout/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/timeout/msbuild/client/net5.0/client.csproj
index e41e5974e5f..71bb84414f7 100644
--- a/csharp/test/Ice/timeout/msbuild/client/net5.0/client.csproj
+++ b/csharp/test/Ice/timeout/msbuild/client/net5.0/client.csproj
@@ -25,7 +25,7 @@
<Choose>
<When Condition="'$(ICE_BIN_DIST)' == 'all'">
<ItemGroup>
- <PackageReference Include="zeroc.ice.net" Version="3.7.5" />
+ <PackageReference Include="zeroc.ice.net" Version="3.8.0" />
</ItemGroup>
</When>
<Otherwise>
diff --git a/csharp/test/Ice/timeout/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/timeout/msbuild/client/netstandard2.0/client.csproj
index 33d2a4a2f70..911fc0d9dcf 100644
--- a/csharp/test/Ice/timeout/msbuild/client/netstandard2.0/client.csproj
+++ b/csharp/test/Ice/timeout/msbuild/client/netstandard2.0/client.csproj
@@ -26,7 +26,7 @@
<Choose>
<When Condition="'$(ICE_BIN_DIST)' == 'all'">
<ItemGroup>
- <PackageReference Include="zeroc.ice.net" Version="3.7.5" />
+ <PackageReference Include="zeroc.ice.net" Version="3.8.0" />
</ItemGroup>
</When>
<Otherwise>
diff --git a/csharp/test/Ice/timeout/msbuild/server/net45/packages.config b/csharp/test/Ice/timeout/msbuild/server/net45/packages.config
index 7f20c0c71e3..e71444c80e6 100644
--- a/csharp/test/Ice/timeout/msbuild/server/net45/packages.config
+++ b/csharp/test/Ice/timeout/msbuild/server/net45/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="zeroc.ice.net" version="3.7.5" targetFramework="net452" />
+ <package id="zeroc.ice.net" version="3.8.0" targetFramework="net452" />
<package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="net451" />
</packages> \ No newline at end of file
diff --git a/csharp/test/Ice/timeout/msbuild/server/net45/server.csproj b/csharp/test/Ice/timeout/msbuild/server/net45/server.csproj
index 35c7605b49c..f1c0eb04116 100644
--- a/csharp/test/Ice/timeout/msbuild/server/net45/server.csproj
+++ b/csharp/test/Ice/timeout/msbuild/server/net45/server.csproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
<Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" />
- <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props" />
+ <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.8.0\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.8.0\build\zeroc.ice.net.props" />
<PropertyGroup Label="Globals">
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
@@ -21,7 +21,7 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.7.5.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.8.0.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
<HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
@@ -58,7 +58,7 @@
<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.5\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.8.0\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.8.0\build\zeroc.ice.net.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" />
</Target>
diff --git a/csharp/test/Ice/timeout/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/timeout/msbuild/server/net5.0/server.csproj
index a12248f9ed5..0a64eb5dba7 100644
--- a/csharp/test/Ice/timeout/msbuild/server/net5.0/server.csproj
+++ b/csharp/test/Ice/timeout/msbuild/server/net5.0/server.csproj
@@ -24,7 +24,7 @@
<Choose>
<When Condition="'$(ICE_BIN_DIST)' == 'all'">
<ItemGroup>
- <PackageReference Include="zeroc.ice.net" Version="3.7.5" />
+ <PackageReference Include="zeroc.ice.net" Version="3.8.0" />
</ItemGroup>
</When>
<Otherwise>
diff --git a/csharp/test/Ice/timeout/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/timeout/msbuild/server/netstandard2.0/server.csproj
index 2b08a051caa..a7f03a9515a 100644
--- a/csharp/test/Ice/timeout/msbuild/server/netstandard2.0/server.csproj
+++ b/csharp/test/Ice/timeout/msbuild/server/netstandard2.0/server.csproj
@@ -25,7 +25,7 @@
<Choose>
<When Condition="'$(ICE_BIN_DIST)' == 'all'">
<ItemGroup>
- <PackageReference Include="zeroc.ice.net" Version="3.7.5" />
+ <PackageReference Include="zeroc.ice.net" Version="3.8.0" />
</ItemGroup>
</When>
<Otherwise>
diff --git a/csharp/test/Ice/timeout/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/timeout/msbuild/test/netstandard2.0/test.csproj
index db467bd5c0f..6c17844aafd 100644
--- a/csharp/test/Ice/timeout/msbuild/test/netstandard2.0/test.csproj
+++ b/csharp/test/Ice/timeout/msbuild/test/netstandard2.0/test.csproj
@@ -33,7 +33,7 @@
<Choose>
<When Condition="'$(ICE_BIN_DIST)' == 'all'">
<ItemGroup>
- <PackageReference Include="zeroc.ice.net" Version="3.7.5" />
+ <PackageReference Include="zeroc.ice.net" Version="3.8.0" />
</ItemGroup>
</When>
<Otherwise>