diff options
Diffstat (limited to 'cpp/test/IceGrid')
54 files changed, 540 insertions, 540 deletions
diff --git a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj index 39c470f02e8..f28a69d1741 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/activation/msbuild/client/packages.config b/cpp/test/IceGrid/activation/msbuild/client/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/packages.config +++ b/cpp/test/IceGrid/activation/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/activation/msbuild/server/packages.config b/cpp/test/IceGrid/activation/msbuild/server/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/packages.config +++ b/cpp/test/IceGrid/activation/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj index 323e09d8682..45c28775b12 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/admin/msbuild/packages.config b/cpp/test/IceGrid/admin/msbuild/packages.config index 3c0f2a22ca2..d845e6ffe06 100644 --- a/cpp/test/IceGrid/admin/msbuild/packages.config +++ b/cpp/test/IceGrid/admin/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/admin/msbuild/server.vcxproj b/cpp/test/IceGrid/admin/msbuild/server.vcxproj index e8e2942e38c..4d6eed35241 100644 --- a/cpp/test/IceGrid/admin/msbuild/server.vcxproj +++ b/cpp/test/IceGrid/admin/msbuild/server.vcxproj @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -91,10 +91,10 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -166,13 +166,13 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj index e400543b9c0..14b354a2843 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/client/packages.config b/cpp/test/IceGrid/allocation/msbuild/client/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/server/packages.config b/cpp/test/IceGrid/allocation/msbuild/server/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj index 587051219f1..6a4308d6e0e 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config b/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config index 3c0f2a22ca2..d845e6ffe06 100644 --- a/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj b/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj index e67c96d5ae4..e2d22e7d1a9 100644 --- a/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -85,10 +85,10 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -166,13 +166,13 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj index d965fe57abf..ef375161233 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/client/packages.config b/cpp/test/IceGrid/deployer/msbuild/client/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/server/packages.config b/cpp/test/IceGrid/deployer/msbuild/server/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj index 4c9e808e7cc..add3c064128 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config b/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj index 61515bfeef2..40add360f97 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -362,15 +362,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj index b94bfd00f38..00e70cc0728 100644 --- a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/distribution/msbuild/client/packages.config b/cpp/test/IceGrid/distribution/msbuild/client/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/distribution/msbuild/client/packages.config +++ b/cpp/test/IceGrid/distribution/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/distribution/msbuild/server/packages.config b/cpp/test/IceGrid/distribution/msbuild/server/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/distribution/msbuild/server/packages.config +++ b/cpp/test/IceGrid/distribution/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj index b9945c47d6d..f5fa7c47064 100644 --- a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj index b886c88296c..20d87fb3ba2 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj index 187eac9b7cb..b5ec6985afd 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj index 9ae8b97beb8..ed0ef79c114 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -362,15 +362,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj index 391e6bfde1b..165b989f1a6 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config b/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config index 3c0f2a22ca2..d845e6ffe06 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj index bd7c3b92610..bf1e5342e4a 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -91,10 +91,10 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -166,13 +166,13 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config b/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj index 652d0afcc37..589e000fd21 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj index 4a68a3f1d4e..1442889f4fa 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -362,15 +362,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj index b547295156e..b9aa965e60a 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/client/packages.config b/cpp/test/IceGrid/replication/msbuild/client/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/packages.config +++ b/cpp/test/IceGrid/replication/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/server/packages.config b/cpp/test/IceGrid/replication/msbuild/server/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/packages.config +++ b/cpp/test/IceGrid/replication/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj index 4df58d63022..f6b6d4c940d 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj index 8cbf2ced702..b937a1473ab 100644 --- a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/client/packages.config b/cpp/test/IceGrid/session/msbuild/client/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/session/msbuild/client/packages.config +++ b/cpp/test/IceGrid/session/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/server/packages.config b/cpp/test/IceGrid/session/msbuild/server/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/session/msbuild/server/packages.config +++ b/cpp/test/IceGrid/session/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj index 832ae9107be..8a94e0c6635 100644 --- a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/verifier/packages.config b/cpp/test/IceGrid/session/msbuild/verifier/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/packages.config +++ b/cpp/test/IceGrid/session/msbuild/verifier/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj index df684ebb171..cdd452a8c5e 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj index 582b3f58bbf..5fafcf5ac7d 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -345,15 +345,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/client/packages.config b/cpp/test/IceGrid/simple/msbuild/client/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/packages.config +++ b/cpp/test/IceGrid/simple/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/server/packages.config b/cpp/test/IceGrid/simple/msbuild/server/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/packages.config +++ b/cpp/test/IceGrid/simple/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj index 9319aaf72c8..ba0cde9e66a 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj index 1d10a5f7ca1..cfd0c842c41 100644 --- a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -321,15 +321,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/client/packages.config b/cpp/test/IceGrid/update/msbuild/client/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/update/msbuild/client/packages.config +++ b/cpp/test/IceGrid/update/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/server/packages.config b/cpp/test/IceGrid/update/msbuild/server/packages.config index 89544b222fd..930bffcc70d 100644 --- a/cpp/test/IceGrid/update/msbuild/server/packages.config +++ b/cpp/test/IceGrid/update/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.3" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.3" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj index 85237eeae64..020df85f518 100644 --- a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <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 Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <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')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <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.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.3\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.3\build\native\zeroc.ice.v141.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'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.3\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file |