summaryrefslogtreecommitdiff
path: root/csharp/test/Ice/proxy
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-04-11 07:52:46 +0200
committerJose <jose@zeroc.com>2018-04-11 07:52:46 +0200
commitfcd9d5466b720b653ab520ecb45fe019d701d6f0 (patch)
tree8518515975f28af591cc7440c56f5c290125ff5e /csharp/test/Ice/proxy
parentFixed Xcode 9.3 warnings from interceptor test when building C++11 XcodeSDK o... (diff)
downloadice-fcd9d5466b720b653ab520ecb45fe019d701d6f0.tar.bz2
ice-fcd9d5466b720b653ab520ecb45fe019d701d6f0.tar.xz
ice-fcd9d5466b720b653ab520ecb45fe019d701d6f0.zip
Update .NET packages version
Diffstat (limited to 'csharp/test/Ice/proxy')
-rw-r--r--csharp/test/Ice/proxy/msbuild/client/net45/client.csproj4
-rw-r--r--csharp/test/Ice/proxy/msbuild/client/net45/packages.config2
-rw-r--r--csharp/test/Ice/proxy/msbuild/client/netstandard2.0/client.csproj2
-rw-r--r--csharp/test/Ice/proxy/msbuild/collocated/net45/collocated.csproj4
-rw-r--r--csharp/test/Ice/proxy/msbuild/collocated/net45/packages.config2
-rw-r--r--csharp/test/Ice/proxy/msbuild/collocated/netstandard2.0/collocated.csproj2
-rw-r--r--csharp/test/Ice/proxy/msbuild/server/net45/packages.config2
-rw-r--r--csharp/test/Ice/proxy/msbuild/server/net45/server.csproj4
-rw-r--r--csharp/test/Ice/proxy/msbuild/server/netstandard2.0/server.csproj2
-rw-r--r--csharp/test/Ice/proxy/msbuild/serveramd/net45/packages.config2
-rw-r--r--csharp/test/Ice/proxy/msbuild/serveramd/net45/serveramd.csproj4
-rw-r--r--csharp/test/Ice/proxy/msbuild/serveramd/netstandard2.0/serveramd.csproj2
12 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 8a58e8988d4..81d919beb7e 100644
--- a/csharp/test/Ice/proxy/msbuild/client/net45/client.csproj
+++ b/csharp/test/Ice/proxy/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.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
- <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1-beta1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1-beta1\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>
</NuGetPackageImportStamp>
@@ -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.1-beta1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1-beta1\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'))"/>
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
</Target>
diff --git a/csharp/test/Ice/proxy/msbuild/client/net45/packages.config b/csharp/test/Ice/proxy/msbuild/client/net45/packages.config
index 4d85ab846a8..91f1d232e55 100644
--- a/csharp/test/Ice/proxy/msbuild/client/net45/packages.config
+++ b/csharp/test/Ice/proxy/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.1-beta1" targetFramework="net452" />
+ <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
<package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
</packages> \ No newline at end of file
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 d6656be6195..7f4c94765f6 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 @@
<Choose>
<When Condition="'$(ICE_BIN_DIST)' == 'all'">
<ItemGroup>
- <PackageReference Include="zeroc.ice.net" Version="3.7.1-beta1"/>
+ <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
</ItemGroup>
</When>
<Otherwise>
diff --git a/csharp/test/Ice/proxy/msbuild/collocated/net45/collocated.csproj b/csharp/test/Ice/proxy/msbuild/collocated/net45/collocated.csproj
index 39260453862..f23d6d5d9f1 100644
--- a/csharp/test/Ice/proxy/msbuild/collocated/net45/collocated.csproj
+++ b/csharp/test/Ice/proxy/msbuild/collocated/net45/collocated.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.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
- <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1-beta1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1-beta1\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>
</NuGetPackageImportStamp>
@@ -73,7 +73,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.1-beta1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1-beta1\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'))"/>
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
</Target>
diff --git a/csharp/test/Ice/proxy/msbuild/collocated/net45/packages.config b/csharp/test/Ice/proxy/msbuild/collocated/net45/packages.config
index 4d85ab846a8..91f1d232e55 100644
--- a/csharp/test/Ice/proxy/msbuild/collocated/net45/packages.config
+++ b/csharp/test/Ice/proxy/msbuild/collocated/net45/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="zeroc.ice.net" version="3.7.1-beta1" targetFramework="net452" />
+ <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
<package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
</packages> \ No newline at end of file
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 1d24c431243..ad4c472b48c 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 @@
<Choose>
<When Condition="'$(ICE_BIN_DIST)' == 'all'">
<ItemGroup>
- <PackageReference Include="zeroc.ice.net" Version="3.7.1-beta1"/>
+ <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
</ItemGroup>
</When>
<Otherwise>
diff --git a/csharp/test/Ice/proxy/msbuild/server/net45/packages.config b/csharp/test/Ice/proxy/msbuild/server/net45/packages.config
index 4d85ab846a8..91f1d232e55 100644
--- a/csharp/test/Ice/proxy/msbuild/server/net45/packages.config
+++ b/csharp/test/Ice/proxy/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.1-beta1" targetFramework="net452" />
+ <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
<package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
</packages> \ No newline at end of file
diff --git a/csharp/test/Ice/proxy/msbuild/server/net45/server.csproj b/csharp/test/Ice/proxy/msbuild/server/net45/server.csproj
index 106b3296ad5..1613c859878 100644
--- a/csharp/test/Ice/proxy/msbuild/server/net45/server.csproj
+++ b/csharp/test/Ice/proxy/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.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
- <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1-beta1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1-beta1\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>
</NuGetPackageImportStamp>
@@ -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.1-beta1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1-beta1\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'))"/>
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
</Target>
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 04e1d25f803..9a2a76034c6 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 @@
<Choose>
<When Condition="'$(ICE_BIN_DIST)' == 'all'">
<ItemGroup>
- <PackageReference Include="zeroc.ice.net" Version="3.7.1-beta1"/>
+ <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
</ItemGroup>
</When>
<Otherwise>
diff --git a/csharp/test/Ice/proxy/msbuild/serveramd/net45/packages.config b/csharp/test/Ice/proxy/msbuild/serveramd/net45/packages.config
index 4d85ab846a8..91f1d232e55 100644
--- a/csharp/test/Ice/proxy/msbuild/serveramd/net45/packages.config
+++ b/csharp/test/Ice/proxy/msbuild/serveramd/net45/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="zeroc.ice.net" version="3.7.1-beta1" targetFramework="net452" />
+ <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
<package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
</packages> \ No newline at end of file
diff --git a/csharp/test/Ice/proxy/msbuild/serveramd/net45/serveramd.csproj b/csharp/test/Ice/proxy/msbuild/serveramd/net45/serveramd.csproj
index 0d542e6aa12..06912be9832 100644
--- a/csharp/test/Ice/proxy/msbuild/serveramd/net45/serveramd.csproj
+++ b/csharp/test/Ice/proxy/msbuild/serveramd/net45/serveramd.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.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
- <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1-beta1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1-beta1\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>
</NuGetPackageImportStamp>
@@ -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.1-beta1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1-beta1\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'))"/>
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
</Target>
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 28f2b982811..8cbc2fae883 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 @@
<Choose>
<When Condition="'$(ICE_BIN_DIST)' == 'all'">
<ItemGroup>
- <PackageReference Include="zeroc.ice.net" Version="3.7.1-beta1"/>
+ <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
</ItemGroup>
</When>
<Otherwise>