diff options
author | Jose <jose@zeroc.com> | 2018-02-08 18:32:13 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2018-02-08 18:32:13 +0100 |
commit | 4fe93b575e36a2d0735543ae7dd4450757f48daf (patch) | |
tree | 95d08a2a6ebc831f89fa8fc057cf55fd17f52d2f /csharp/test/Ice/slicing/exceptions/msbuild/server/net45 | |
parent | Merge branch '3.7' of github.com:zeroc-ice/ice into 3.7 (diff) | |
download | ice-4fe93b575e36a2d0735543ae7dd4450757f48daf.tar.bz2 ice-4fe93b575e36a2d0735543ae7dd4450757f48daf.tar.xz ice-4fe93b575e36a2d0735543ae7dd4450757f48daf.zip |
Update msbuild projects to use 5.0.2 builder
Diffstat (limited to 'csharp/test/Ice/slicing/exceptions/msbuild/server/net45')
-rw-r--r-- | csharp/test/Ice/slicing/exceptions/msbuild/server/net45/packages.config | 2 | ||||
-rw-r--r-- | csharp/test/Ice/slicing/exceptions/msbuild/server/net45/server.csproj | 8 |
2 files changed, 5 insertions, 5 deletions
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 ecfaac17929..cf2ecf6c286 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" targetFramework="net452" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.1" targetFramework="net451" /> + <package id="zeroc.icebuilder.msbuild" version="5.0.2" 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 6a0cbb0f551..3cc52deb3d5 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.1\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props')"/> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.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> @@ -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\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.1\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props'))"/> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props'))"/> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets'))"/> </Target> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')"/> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')"/> </Project> |