summaryrefslogtreecommitdiff
path: root/csharp/test/IceSSL
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-04-06 22:13:29 +0200
committerJose <jose@zeroc.com>2018-04-06 22:13:29 +0200
commitb2ed76356947bee3a6dbd2efed486f60feab1b23 (patch)
tree1c6ab66e5edbc39095b1cfafd614e3b4442a71d1 /csharp/test/IceSSL
parentIce/interceptor test unused lambda capture (diff)
downloadice-b2ed76356947bee3a6dbd2efed486f60feab1b23.tar.bz2
ice-b2ed76356947bee3a6dbd2efed486f60feab1b23.tar.xz
ice-b2ed76356947bee3a6dbd2efed486f60feab1b23.zip
Update Visual Studio projects to MSBuild builder 5.0.4
Diffstat (limited to 'csharp/test/IceSSL')
-rw-r--r--csharp/test/IceSSL/configuration/msbuild/client/net45/client.csproj8
-rw-r--r--csharp/test/IceSSL/configuration/msbuild/client/net45/packages.config2
-rw-r--r--csharp/test/IceSSL/configuration/msbuild/client/netstandard2.0/client.csproj2
-rw-r--r--csharp/test/IceSSL/configuration/msbuild/server/net45/packages.config2
-rw-r--r--csharp/test/IceSSL/configuration/msbuild/server/net45/server.csproj8
-rw-r--r--csharp/test/IceSSL/configuration/msbuild/server/netstandard2.0/server.csproj2
6 files changed, 12 insertions, 12 deletions
diff --git a/csharp/test/IceSSL/configuration/msbuild/client/net45/client.csproj b/csharp/test/IceSSL/configuration/msbuild/client/net45/client.csproj
index fe91e894653..1ef5da743ff 100644
--- a/csharp/test/IceSSL/configuration/msbuild/client/net45/client.csproj
+++ b/csharp/test/IceSSL/configuration/msbuild/client/net45/client.csproj
@@ -1,6 +1,6 @@
<?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.3\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.props')"/>
+ <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"/>
<PropertyGroup Label="Globals">
<NuGetPackageImportStamp>
@@ -70,8 +70,8 @@
<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.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.props'))"/>
- <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.targets'))"/>
+ <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>
- <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.targets')"/>
+ <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
</Project>
diff --git a/csharp/test/IceSSL/configuration/msbuild/client/net45/packages.config b/csharp/test/IceSSL/configuration/msbuild/client/net45/packages.config
index 337d36fb64d..4d85ab846a8 100644
--- a/csharp/test/IceSSL/configuration/msbuild/client/net45/packages.config
+++ b/csharp/test/IceSSL/configuration/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.icebuilder.msbuild" version="5.0.3" targetFramework="net451" />
+ <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
</packages> \ No newline at end of file
diff --git a/csharp/test/IceSSL/configuration/msbuild/client/netstandard2.0/client.csproj b/csharp/test/IceSSL/configuration/msbuild/client/netstandard2.0/client.csproj
index 7f5ebe0c667..846fd1d0439 100644
--- a/csharp/test/IceSSL/configuration/msbuild/client/netstandard2.0/client.csproj
+++ b/csharp/test/IceSSL/configuration/msbuild/client/netstandard2.0/client.csproj
@@ -15,7 +15,7 @@
<Compile Include="../../../CertificateVerifierI.cs"/>
<Compile Include="../../../PasswordCallbackI.cs"/>
<Compile Include="../../../Client.cs"/>
- <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.3"/>
+ <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
<SliceCompile Include="../../../Test.ice"/>
</ItemGroup>
<Choose>
diff --git a/csharp/test/IceSSL/configuration/msbuild/server/net45/packages.config b/csharp/test/IceSSL/configuration/msbuild/server/net45/packages.config
index 337d36fb64d..4d85ab846a8 100644
--- a/csharp/test/IceSSL/configuration/msbuild/server/net45/packages.config
+++ b/csharp/test/IceSSL/configuration/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.icebuilder.msbuild" version="5.0.3" targetFramework="net451" />
+ <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
</packages> \ No newline at end of file
diff --git a/csharp/test/IceSSL/configuration/msbuild/server/net45/server.csproj b/csharp/test/IceSSL/configuration/msbuild/server/net45/server.csproj
index 9bbfa1e0a65..5440ed773fa 100644
--- a/csharp/test/IceSSL/configuration/msbuild/server/net45/server.csproj
+++ b/csharp/test/IceSSL/configuration/msbuild/server/net45/server.csproj
@@ -1,6 +1,6 @@
<?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.3\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.props')"/>
+ <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"/>
<PropertyGroup Label="Globals">
<NuGetPackageImportStamp>
@@ -64,8 +64,8 @@
<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.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.props'))"/>
- <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.targets'))"/>
+ <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>
- <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.targets')"/>
+ <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
</Project>
diff --git a/csharp/test/IceSSL/configuration/msbuild/server/netstandard2.0/server.csproj b/csharp/test/IceSSL/configuration/msbuild/server/netstandard2.0/server.csproj
index b04364ab398..0478e1600e8 100644
--- a/csharp/test/IceSSL/configuration/msbuild/server/netstandard2.0/server.csproj
+++ b/csharp/test/IceSSL/configuration/msbuild/server/netstandard2.0/server.csproj
@@ -13,7 +13,7 @@
<Compile Include="../../../../../TestCommon/TestApp.cs"/>
<Compile Include="../../../TestI.cs"/>
<Compile Include="../../../Server.cs"/>
- <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.3"/>
+ <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
<SliceCompile Include="../../../Test.ice"/>
</ItemGroup>
<Choose>