summaryrefslogtreecommitdiff
path: root/csharp/test/Ice/slicing/exceptions
diff options
context:
space:
mode:
Diffstat (limited to 'csharp/test/Ice/slicing/exceptions')
-rw-r--r--csharp/test/Ice/slicing/exceptions/msbuild/client/net45/client.csproj8
-rw-r--r--csharp/test/Ice/slicing/exceptions/msbuild/client/net45/packages.config2
-rw-r--r--csharp/test/Ice/slicing/exceptions/msbuild/client/netstandard2.0/client.csproj2
-rw-r--r--csharp/test/Ice/slicing/exceptions/msbuild/server/net45/packages.config2
-rw-r--r--csharp/test/Ice/slicing/exceptions/msbuild/server/net45/server.csproj8
-rw-r--r--csharp/test/Ice/slicing/exceptions/msbuild/server/netstandard2.0/server.csproj2
-rw-r--r--csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/packages.config2
-rw-r--r--csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/serveramd.csproj8
-rw-r--r--csharp/test/Ice/slicing/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj2
9 files changed, 18 insertions, 18 deletions
diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/client/net45/client.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/client/net45/client.csproj
index f0d69cba1fc..9b90cec4a85 100644
--- a/csharp/test/Ice/slicing/exceptions/msbuild/client/net45/client.csproj
+++ b/csharp/test/Ice/slicing/exceptions/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>
@@ -71,8 +71,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/Ice/slicing/exceptions/msbuild/client/net45/packages.config b/csharp/test/Ice/slicing/exceptions/msbuild/client/net45/packages.config
index 337d36fb64d..4d85ab846a8 100644
--- a/csharp/test/Ice/slicing/exceptions/msbuild/client/net45/packages.config
+++ b/csharp/test/Ice/slicing/exceptions/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/Ice/slicing/exceptions/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/client/netstandard2.0/client.csproj
index ea64f80e5bb..67fcca1d92c 100644
--- a/csharp/test/Ice/slicing/exceptions/msbuild/client/netstandard2.0/client.csproj
+++ b/csharp/test/Ice/slicing/exceptions/msbuild/client/netstandard2.0/client.csproj
@@ -18,7 +18,7 @@
<Compile Include="../../../../../../TestCommon/TestApp.cs"/>
<Compile Include="../../../AllTests.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"/>
<SliceCompile Include="../../../ClientPrivate.ice"/>
</ItemGroup>
diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/server/net45/packages.config b/csharp/test/Ice/slicing/exceptions/msbuild/server/net45/packages.config
index 337d36fb64d..4d85ab846a8 100644
--- a/csharp/test/Ice/slicing/exceptions/msbuild/server/net45/packages.config
+++ b/csharp/test/Ice/slicing/exceptions/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/Ice/slicing/exceptions/msbuild/server/net45/server.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/server/net45/server.csproj
index c9b7e6c5aeb..b6c4bda9cc7 100644
--- a/csharp/test/Ice/slicing/exceptions/msbuild/server/net45/server.csproj
+++ b/csharp/test/Ice/slicing/exceptions/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>
@@ -68,8 +68,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/Ice/slicing/exceptions/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/server/netstandard2.0/server.csproj
index e42882ac48f..dc943709e47 100644
--- a/csharp/test/Ice/slicing/exceptions/msbuild/server/netstandard2.0/server.csproj
+++ b/csharp/test/Ice/slicing/exceptions/msbuild/server/netstandard2.0/server.csproj
@@ -18,7 +18,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"/>
<SliceCompile Include="../../../ServerPrivate.ice"/>
</ItemGroup>
diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/packages.config b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/packages.config
index 337d36fb64d..4d85ab846a8 100644
--- a/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/packages.config
+++ b/csharp/test/Ice/slicing/exceptions/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.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/Ice/slicing/exceptions/msbuild/serveramd/net45/serveramd.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/serveramd.csproj
index 23a11bceaa5..c4c6dccdc27 100644
--- a/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/serveramd.csproj
+++ b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/serveramd.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>
@@ -68,8 +68,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/Ice/slicing/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj
index e3256aa05b4..e0ea1375271 100644
--- a/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj
+++ b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj
@@ -18,7 +18,7 @@
<Compile Include="../../../../../../TestCommon/TestApp.cs"/>
<Compile Include="../../../TestAMDI.cs"/>
<Compile Include="../../../ServerAMD.cs"/>
- <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.3"/>
+ <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
<SliceCompile Include="../../../TestAMD.ice"/>
<SliceCompile Include="../../../ServerPrivateAMD.ice"/>
</ItemGroup>