diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-03 18:28:04 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-03 18:28:04 +0200 |
| commit | 9cd4736682f76b22eb3e7e947a73171df2c86c32 (patch) | |
| tree | e013fab8900b9ba58a8b85de106c97d5c5330ee2 /cpp/test | |
| parent | Merge remote-tracking branch 'origin/3.7' (diff) | |
| download | ice-9cd4736682f76b22eb3e7e947a73171df2c86c32.tar.bz2 ice-9cd4736682f76b22eb3e7e947a73171df2c86c32.tar.xz ice-9cd4736682f76b22eb3e7e947a73171df2c86c32.zip | |
Updated version to 3.7.0
Diffstat (limited to 'cpp/test')
577 files changed, 5598 insertions, 5598 deletions
diff --git a/cpp/test/Common/msbuild/packages.config b/cpp/test/Common/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Common/msbuild/packages.config +++ b/cpp/test/Common/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Common/msbuild/testcommon.vcxproj b/cpp/test/Common/msbuild/testcommon.vcxproj index 37e7dbb755d..56fdc4fe438 100644 --- a/cpp/test/Common/msbuild/testcommon.vcxproj +++ b/cpp/test/Common/msbuild/testcommon.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -178,10 +178,10 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> @@ -193,13 +193,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Common/msbuild/uwp/packages.config b/cpp/test/Common/msbuild/uwp/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Common/msbuild/uwp/packages.config +++ b/cpp/test/Common/msbuild/uwp/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj b/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj index 9e023b04df1..6abdf137eaf 100644 --- a/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj +++ b/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.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" /> @@ -155,15 +155,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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj index 21d68190a7b..cf2c828de4e 100644 --- a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/application/msbuild/client/packages.config b/cpp/test/Glacier2/application/msbuild/client/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/application/msbuild/client/packages.config +++ b/cpp/test/Glacier2/application/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/application/msbuild/server/packages.config b/cpp/test/Glacier2/application/msbuild/server/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/application/msbuild/server/packages.config +++ b/cpp/test/Glacier2/application/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj index dd6ddd185af..c4d4404a35b 100644 --- a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj index af1b7e9353d..a6c21ba6424 100644 --- a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -326,11 +326,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/attack/msbuild/client/packages.config b/cpp/test/Glacier2/attack/msbuild/client/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/attack/msbuild/client/packages.config +++ b/cpp/test/Glacier2/attack/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/attack/msbuild/server/packages.config b/cpp/test/Glacier2/attack/msbuild/server/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/attack/msbuild/server/packages.config +++ b/cpp/test/Glacier2/attack/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj index 97c0975f168..cdbe8786eaa 100644 --- a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj index 48865be5d3c..887924b7e52 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj index 11c4298ad93..591240aa698 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -331,11 +331,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj index e2500552d16..24f917380c1 100644 --- a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -246,9 +246,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/override/msbuild/client/packages.config b/cpp/test/Glacier2/override/msbuild/client/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/override/msbuild/client/packages.config +++ b/cpp/test/Glacier2/override/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/override/msbuild/server/packages.config b/cpp/test/Glacier2/override/msbuild/server/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/override/msbuild/server/packages.config +++ b/cpp/test/Glacier2/override/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj index d58d20a6e18..32d5608bf4a 100644 --- a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj index 9e4fd433491..c5ae366c063 100644 --- a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -246,9 +246,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/router/msbuild/client/packages.config b/cpp/test/Glacier2/router/msbuild/client/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/router/msbuild/client/packages.config +++ b/cpp/test/Glacier2/router/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/router/msbuild/server/packages.config b/cpp/test/Glacier2/router/msbuild/server/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/router/msbuild/server/packages.config +++ b/cpp/test/Glacier2/router/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj index f08468debd2..a7469d3fc71 100644 --- a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj index 669d2b92988..66be4f89cc4 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config b/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config +++ b/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config b/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config +++ b/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj index 2ec33b6aab3..3b0b96a24e1 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj index e50c2a7d98a..a3d66825c2c 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config b/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config +++ b/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config b/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config +++ b/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj index 2a7f0bdd4b8..e9d5b13fbb8 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj b/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj index fa03e9873d9..8f9f26bca0b 100644 --- a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -95,9 +95,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -176,11 +176,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/ssl/msbuild/client/packages.config b/cpp/test/Glacier2/ssl/msbuild/client/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/ssl/msbuild/client/packages.config +++ b/cpp/test/Glacier2/ssl/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/ssl/msbuild/server/packages.config b/cpp/test/Glacier2/ssl/msbuild/server/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/ssl/msbuild/server/packages.config +++ b/cpp/test/Glacier2/ssl/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj b/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj index 79ab1d23bbc..30190edc327 100644 --- a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -176,11 +176,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj index 90ff15eb380..b4b241bf8d0 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -245,9 +245,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -326,11 +326,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config b/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config +++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config b/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config +++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj index 97374e3fc22..1f8ac3cf90c 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/client/client.vcxproj b/cpp/test/Ice/acm/msbuild/client/client.vcxproj index 511deb4ab60..4dd1ae68596 100644 --- a/cpp/test/Ice/acm/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/acm/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -285,14 +285,14 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/acm/msbuild/client/packages.config b/cpp/test/Ice/acm/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/acm/msbuild/client/packages.config +++ b/cpp/test/Ice/acm/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/server/packages.config b/cpp/test/Ice/acm/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/acm/msbuild/server/packages.config +++ b/cpp/test/Ice/acm/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/server/server.vcxproj b/cpp/test/Ice/acm/msbuild/server/server.vcxproj index 3bba965e818..0c80d019584 100644 --- a/cpp/test/Ice/acm/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/acm/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj index 0566c944361..879a99ae075 100644 --- a/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -253,16 +253,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/acm/msbuild/uwp/client/packages.config b/cpp/test/Ice/acm/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/acm/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/acm/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/uwp/server/packages.config b/cpp/test/Ice/acm/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/acm/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/acm/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj index f75200d4dfc..e0dba334ba4 100644 --- a/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj index fc056fcb2d6..b19790af145 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -291,13 +291,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj index 507241926f1..9887e878fae 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -335,13 +335,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj index 50b6df3a1f1..329bdee0621 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -334,13 +334,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj index f41c117e639..405293027d9 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -223,16 +223,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj index fba7e175056..437d9535d23 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -257,16 +257,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj index 77a56a0364d..bac9b44b116 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -261,16 +261,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/admin/msbuild/client/client.vcxproj b/cpp/test/Ice/admin/msbuild/client/client.vcxproj index f2aecc31fff..aa4c3e54775 100644 --- a/cpp/test/Ice/admin/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/admin/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/client/packages.config b/cpp/test/Ice/admin/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/admin/msbuild/client/packages.config +++ b/cpp/test/Ice/admin/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/server/packages.config b/cpp/test/Ice/admin/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/admin/msbuild/server/packages.config +++ b/cpp/test/Ice/admin/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/server/server.vcxproj b/cpp/test/Ice/admin/msbuild/server/server.vcxproj index 705146f6540..cefb5460e43 100644 --- a/cpp/test/Ice/admin/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/admin/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj index 13477aa9bfc..f9f030c182d 100644 --- a/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -253,16 +253,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/admin/msbuild/uwp/client/packages.config b/cpp/test/Ice/admin/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/admin/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/admin/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/uwp/server/packages.config b/cpp/test/Ice/admin/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/admin/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/admin/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj index 1fcab9fb9b8..498dcdd5b3e 100644 --- a/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/ami/msbuild/client/client.vcxproj b/cpp/test/Ice/ami/msbuild/client/client.vcxproj index 7101c6305ef..0c787636c06 100644 --- a/cpp/test/Ice/ami/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/ami/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -291,13 +291,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/client/packages.config b/cpp/test/Ice/ami/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/ami/msbuild/client/packages.config +++ b/cpp/test/Ice/ami/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj index e15e89b32c2..2c54e1639e3 100644 --- a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/ami/msbuild/collocated/collocated.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -333,13 +333,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/collocated/packages.config b/cpp/test/Ice/ami/msbuild/collocated/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/ami/msbuild/collocated/packages.config +++ b/cpp/test/Ice/ami/msbuild/collocated/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/server/packages.config b/cpp/test/Ice/ami/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/ami/msbuild/server/packages.config +++ b/cpp/test/Ice/ami/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/server/server.vcxproj b/cpp/test/Ice/ami/msbuild/server/server.vcxproj index 784719d6783..8e8a7306a02 100644 --- a/cpp/test/Ice/ami/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/ami/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj index 630e0c272e9..9111ee26781 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -223,16 +223,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/ami/msbuild/uwp/client/packages.config b/cpp/test/Ice/ami/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/ami/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj index abd9d0bde6e..ce54fef98b8 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -255,16 +255,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/ami/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/ami/msbuild/uwp/collocated/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/ami/msbuild/uwp/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/uwp/server/packages.config b/cpp/test/Ice/ami/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/ami/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj index 5ad57cf763d..a8fd99dc5ce 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/background/msbuild/client/client.vcxproj b/cpp/test/Ice/background/msbuild/client/client.vcxproj index 901a0b25c38..a35629f4587 100644 --- a/cpp/test/Ice/background/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/background/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -209,13 +209,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/client/packages.config b/cpp/test/Ice/background/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/background/msbuild/client/packages.config +++ b/cpp/test/Ice/background/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/server/packages.config b/cpp/test/Ice/background/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/background/msbuild/server/packages.config +++ b/cpp/test/Ice/background/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/server/server.vcxproj b/cpp/test/Ice/background/msbuild/server/server.vcxproj index 156d85e6e33..686d5679074 100644 --- a/cpp/test/Ice/background/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/background/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -210,13 +210,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/testtransport/packages.config b/cpp/test/Ice/background/msbuild/testtransport/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/background/msbuild/testtransport/packages.config +++ b/cpp/test/Ice/background/msbuild/testtransport/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj index a904a20a885..c7eb3f9a0ef 100644 --- a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj +++ b/cpp/test/Ice/background/msbuild/testtransport/testtransport.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -351,13 +351,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/client/client.vcxproj b/cpp/test/Ice/binding/msbuild/client/client.vcxproj index d1b14ca3a95..7736b13579e 100644 --- a/cpp/test/Ice/binding/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/binding/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -291,13 +291,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/client/packages.config b/cpp/test/Ice/binding/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/binding/msbuild/client/packages.config +++ b/cpp/test/Ice/binding/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/server/packages.config b/cpp/test/Ice/binding/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/binding/msbuild/server/packages.config +++ b/cpp/test/Ice/binding/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/server/server.vcxproj b/cpp/test/Ice/binding/msbuild/server/server.vcxproj index c26f72da971..67ba3298fab 100644 --- a/cpp/test/Ice/binding/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/binding/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj index 18347ba0068..be70c48e594 100644 --- a/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -223,16 +223,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/binding/msbuild/uwp/client/packages.config b/cpp/test/Ice/binding/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/binding/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/binding/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/uwp/server/packages.config b/cpp/test/Ice/binding/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/binding/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/binding/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj index 825e5ae9087..5a510df850d 100644 --- a/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/checksum/msbuild/client/client.vcxproj b/cpp/test/Ice/checksum/msbuild/client/client.vcxproj index d8e4140e8de..761903a683d 100644 --- a/cpp/test/Ice/checksum/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/checksum/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -479,13 +479,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/client/packages.config b/cpp/test/Ice/checksum/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/checksum/msbuild/client/packages.config +++ b/cpp/test/Ice/checksum/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/server/packages.config b/cpp/test/Ice/checksum/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/checksum/msbuild/server/packages.config +++ b/cpp/test/Ice/checksum/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/server/server.vcxproj b/cpp/test/Ice/checksum/msbuild/server/server.vcxproj index 94b87ae6776..fd0116df531 100644 --- a/cpp/test/Ice/checksum/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/checksum/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -480,13 +480,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj index ff6984492e6..e8265cd594b 100644 --- a/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -311,16 +311,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config b/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config b/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj index 22f7eaf0a0e..9dfdc24d6cc 100644 --- a/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -347,16 +347,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/custom/msbuild/client/client.vcxproj b/cpp/test/Ice/custom/msbuild/client/client.vcxproj index cd8573cbba1..fcc0104f20d 100644 --- a/cpp/test/Ice/custom/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/custom/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -480,13 +480,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/client/packages.config b/cpp/test/Ice/custom/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/custom/msbuild/client/packages.config +++ b/cpp/test/Ice/custom/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj index a89e39e4cf3..21672bab5e8 100644 --- a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/custom/msbuild/collocated/collocated.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -484,13 +484,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/collocated/packages.config b/cpp/test/Ice/custom/msbuild/collocated/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/custom/msbuild/collocated/packages.config +++ b/cpp/test/Ice/custom/msbuild/collocated/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/server/packages.config b/cpp/test/Ice/custom/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/custom/msbuild/server/packages.config +++ b/cpp/test/Ice/custom/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/server/server.vcxproj b/cpp/test/Ice/custom/msbuild/server/server.vcxproj index affe04b7497..e6aaeca13d4 100644 --- a/cpp/test/Ice/custom/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/custom/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -483,13 +483,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/serveramd/packages.config b/cpp/test/Ice/custom/msbuild/serveramd/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/custom/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/custom/msbuild/serveramd/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj index 4e414d829af..eb76dc5f1a0 100644 --- a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -483,13 +483,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/custom/msbuild/uwp/client/client.vcxproj index 3ca5d5ca41d..63ebca90383 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/custom/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -342,16 +342,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/custom/msbuild/uwp/client/packages.config b/cpp/test/Ice/custom/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/custom/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/custom/msbuild/uwp/collocated/collocated.vcxproj index 2c232735851..4ea38915269 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/custom/msbuild/uwp/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -346,16 +346,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/custom/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/custom/msbuild/uwp/collocated/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/custom/msbuild/uwp/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/uwp/server/packages.config b/cpp/test/Ice/custom/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/custom/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/custom/msbuild/uwp/server/server.vcxproj index 3825865cc4c..2760514bce1 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/custom/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.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" /> @@ -350,15 +350,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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/custom/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/custom/msbuild/uwp/serveramd/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/custom/msbuild/uwp/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/custom/msbuild/uwp/serveramd/serveramd.vcxproj index 9c7478e60a4..d8daee44cb9 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/custom/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -363,16 +363,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj index 71cc5a9f392..e4ff874dd71 100644 --- a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultServant/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/defaultServant/msbuild/packages.config b/cpp/test/Ice/defaultServant/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/defaultServant/msbuild/packages.config +++ b/cpp/test/Ice/defaultServant/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/defaultServant/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/defaultServant/msbuild/uwp/client/client.vcxproj index ebd70738136..2d186f6000d 100644 --- a/cpp/test/Ice/defaultServant/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/defaultServant/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -255,16 +255,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/defaultServant/msbuild/uwp/client/packages.config b/cpp/test/Ice/defaultServant/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/defaultServant/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/defaultServant/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj index 22ea135d977..44afb8db590 100644 --- a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultValue/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -331,13 +331,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/defaultValue/msbuild/packages.config b/cpp/test/Ice/defaultValue/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/defaultValue/msbuild/packages.config +++ b/cpp/test/Ice/defaultValue/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/defaultValue/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/defaultValue/msbuild/uwp/client/client.vcxproj index 08dd566d90b..8e02a2b5d7e 100644 --- a/cpp/test/Ice/defaultValue/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/defaultValue/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -253,16 +253,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/defaultValue/msbuild/uwp/client/packages.config b/cpp/test/Ice/defaultValue/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/defaultValue/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/defaultValue/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj index 73fca7921e6..aa384eb3cb8 100644 --- a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -333,13 +333,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/client/packages.config b/cpp/test/Ice/dispatcher/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/dispatcher/msbuild/client/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj index 6ada43df1c5..bcfc90ea62f 100644 --- a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -335,13 +335,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config b/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/server/packages.config b/cpp/test/Ice/dispatcher/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/dispatcher/msbuild/server/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj index 0a3639749d9..b1c5b0533b7 100644 --- a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -334,13 +334,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj index 580803a0d1e..e277d343cda 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -255,16 +255,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/client/packages.config b/cpp/test/Ice/dispatcher/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj index 1ce44bdf324..52439e615cf 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -257,16 +257,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/server/packages.config b/cpp/test/Ice/dispatcher/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj index 8b9f964c049..4a2b6e2e363 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -261,16 +261,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/echo/msbuild/packages.config b/cpp/test/Ice/echo/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/echo/msbuild/packages.config +++ b/cpp/test/Ice/echo/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/echo/msbuild/server.vcxproj b/cpp/test/Ice/echo/msbuild/server.vcxproj index 8a464264f2c..4e951279c1b 100644 --- a/cpp/test/Ice/echo/msbuild/server.vcxproj +++ b/cpp/test/Ice/echo/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/client/client.vcxproj b/cpp/test/Ice/enums/msbuild/client/client.vcxproj index b7eb0d0e573..73ca7551d4c 100644 --- a/cpp/test/Ice/enums/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/enums/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -331,13 +331,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/client/packages.config b/cpp/test/Ice/enums/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/enums/msbuild/client/packages.config +++ b/cpp/test/Ice/enums/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/server/packages.config b/cpp/test/Ice/enums/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/enums/msbuild/server/packages.config +++ b/cpp/test/Ice/enums/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/server/server.vcxproj b/cpp/test/Ice/enums/msbuild/server/server.vcxproj index e5594d62714..d68ced4cc6e 100644 --- a/cpp/test/Ice/enums/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/enums/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj index e933a1fbdf7..810b2ac1a53 100644 --- a/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -253,16 +253,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/enums/msbuild/uwp/client/packages.config b/cpp/test/Ice/enums/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/enums/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/enums/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/uwp/server/packages.config b/cpp/test/Ice/enums/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/enums/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/enums/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj index 9871282cd65..031f8b14e61 100644 --- a/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj index 8084736f30e..7e68a7e36ab 100644 --- a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -292,13 +292,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/client/packages.config b/cpp/test/Ice/exceptions/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/exceptions/msbuild/client/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj index 6709959e810..2022dc04120 100644 --- a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -334,13 +334,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/collocated/packages.config b/cpp/test/Ice/exceptions/msbuild/collocated/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/exceptions/msbuild/collocated/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/collocated/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/server/packages.config b/cpp/test/Ice/exceptions/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/exceptions/msbuild/server/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj index 4b45223ae8f..0b539384e42 100644 --- a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -333,13 +333,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config b/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj index 1a31d908ded..ad93dbce175 100644 --- a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -341,13 +341,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj index aac72b103e7..1e4da906f18 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -224,16 +224,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/client/packages.config b/cpp/test/Ice/exceptions/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj index 23e71260988..204f5a440a5 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -256,16 +256,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/server/packages.config b/cpp/test/Ice/exceptions/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj index 967cbd0ec75..573c954f7d0 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -260,16 +260,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj index 86a51569248..c280d5b9145 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -261,16 +261,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/facets/msbuild/client/client.vcxproj b/cpp/test/Ice/facets/msbuild/client/client.vcxproj index 6232bb6595c..c7cb8a5f20a 100644 --- a/cpp/test/Ice/facets/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/facets/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -291,13 +291,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/client/packages.config b/cpp/test/Ice/facets/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/facets/msbuild/client/packages.config +++ b/cpp/test/Ice/facets/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj index 1367d4c67bf..813072a96aa 100644 --- a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/facets/msbuild/collocated/collocated.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -333,13 +333,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/collocated/packages.config b/cpp/test/Ice/facets/msbuild/collocated/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/facets/msbuild/collocated/packages.config +++ b/cpp/test/Ice/facets/msbuild/collocated/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/server/packages.config b/cpp/test/Ice/facets/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/facets/msbuild/server/packages.config +++ b/cpp/test/Ice/facets/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/server/server.vcxproj b/cpp/test/Ice/facets/msbuild/server/server.vcxproj index a757608b70e..14117e696e8 100644 --- a/cpp/test/Ice/facets/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/facets/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj index c2c1b10e34d..dc937aea14d 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -223,16 +223,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/facets/msbuild/uwp/client/packages.config b/cpp/test/Ice/facets/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/facets/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj index 4436228d9ab..ddd7ec5cb85 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -255,16 +255,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/facets/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/facets/msbuild/uwp/collocated/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/facets/msbuild/uwp/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/uwp/server/packages.config b/cpp/test/Ice/facets/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/facets/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj index e9724326ce0..ed86c7dbb06 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj index 13c545b5c1a..6958446ff6f 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -291,13 +291,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/faultTolerance/msbuild/client/packages.config b/cpp/test/Ice/faultTolerance/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/client/packages.config +++ b/cpp/test/Ice/faultTolerance/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/faultTolerance/msbuild/server/packages.config b/cpp/test/Ice/faultTolerance/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/server/packages.config +++ b/cpp/test/Ice/faultTolerance/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj index 9860d909a59..5f6937c9e93 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/gc/msbuild/client.vcxproj b/cpp/test/Ice/gc/msbuild/client.vcxproj index 0a988b59a95..996c96e6f78 100644 --- a/cpp/test/Ice/gc/msbuild/client.vcxproj +++ b/cpp/test/Ice/gc/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -330,13 +330,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/gc/msbuild/packages.config b/cpp/test/Ice/gc/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/gc/msbuild/packages.config +++ b/cpp/test/Ice/gc/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hash/msbuild/client.vcxproj b/cpp/test/Ice/hash/msbuild/client.vcxproj index 98350d73b5c..ed4bf3a7b6b 100644 --- a/cpp/test/Ice/hash/msbuild/client.vcxproj +++ b/cpp/test/Ice/hash/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -330,13 +330,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/hash/msbuild/packages.config b/cpp/test/Ice/hash/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/hash/msbuild/packages.config +++ b/cpp/test/Ice/hash/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj b/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj index f6d5ee5332c..be868053642 100644 --- a/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj +++ b/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -252,16 +252,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/hash/msbuild/uwp/packages.config b/cpp/test/Ice/hash/msbuild/uwp/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/hash/msbuild/uwp/packages.config +++ b/cpp/test/Ice/hash/msbuild/uwp/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/client/client.vcxproj b/cpp/test/Ice/hold/msbuild/client/client.vcxproj index 2a143f884ce..af12464981e 100644 --- a/cpp/test/Ice/hold/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/hold/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -291,13 +291,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/client/packages.config b/cpp/test/Ice/hold/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/hold/msbuild/client/packages.config +++ b/cpp/test/Ice/hold/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/server/packages.config b/cpp/test/Ice/hold/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/hold/msbuild/server/packages.config +++ b/cpp/test/Ice/hold/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/server/server.vcxproj b/cpp/test/Ice/hold/msbuild/server/server.vcxproj index 9f8ed9ba89e..6fb468741c3 100644 --- a/cpp/test/Ice/hold/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/hold/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj index 37cc40ff999..aa8b93ea93c 100644 --- a/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -223,16 +223,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/hold/msbuild/uwp/client/packages.config b/cpp/test/Ice/hold/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/hold/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/hold/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/uwp/server/packages.config b/cpp/test/Ice/hold/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/hold/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/hold/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj index ce510703aae..3a2d032f5d5 100644 --- a/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/impl/msbuild/server/packages.config b/cpp/test/Ice/impl/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/impl/msbuild/server/packages.config +++ b/cpp/test/Ice/impl/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/impl/msbuild/server/server.vcxproj b/cpp/test/Ice/impl/msbuild/server/server.vcxproj index 1df0e4048f8..8e35b13fef2 100644 --- a/cpp/test/Ice/impl/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/impl/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -95,10 +95,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -472,13 +472,13 @@ $(IceToolsPath)\slice2cpp.exe -I$(IceHome)\slice $(IceBuilderImpl) ..\..\Test.ic <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/impl/msbuild/serveramd/packages.config b/cpp/test/Ice/impl/msbuild/serveramd/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/impl/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/impl/msbuild/serveramd/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj index 2746fce7fb4..70c38a64b21 100644 --- a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -95,10 +95,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -470,13 +470,13 @@ $(IceToolsPath)\slice2cpp.exe -I$(IceHome)\slice $(IceBuilderImpl) ..\..\TestAMD <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/client/client.vcxproj b/cpp/test/Ice/info/msbuild/client/client.vcxproj index 6cedcb68c9d..29cf319d93f 100644 --- a/cpp/test/Ice/info/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/info/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -333,13 +333,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/client/packages.config b/cpp/test/Ice/info/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/info/msbuild/client/packages.config +++ b/cpp/test/Ice/info/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/server/packages.config b/cpp/test/Ice/info/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/info/msbuild/server/packages.config +++ b/cpp/test/Ice/info/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/server/server.vcxproj b/cpp/test/Ice/info/msbuild/server/server.vcxproj index a69b52bf5f8..09ec2bd45c9 100644 --- a/cpp/test/Ice/info/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/info/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj index 2643377b435..ec2a6ee7272 100644 --- a/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -253,16 +253,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/info/msbuild/uwp/client/packages.config b/cpp/test/Ice/info/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/info/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/info/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/uwp/server/packages.config b/cpp/test/Ice/info/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/info/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/info/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj index bbf53e211cf..1ab2dd6811d 100644 --- a/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj index 571b8a3f08d..ff155e7520a 100644 --- a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -331,13 +331,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/client/packages.config b/cpp/test/Ice/inheritance/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/inheritance/msbuild/client/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj index 8d12f2a30c3..ee8b8b71c53 100644 --- a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -333,13 +333,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/collocated/packages.config b/cpp/test/Ice/inheritance/msbuild/collocated/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/inheritance/msbuild/collocated/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/collocated/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/server/packages.config b/cpp/test/Ice/inheritance/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/inheritance/msbuild/server/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj b/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj index 11b4f85ffc7..c1364b619ec 100644 --- a/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj index 99d9e2345fa..89a87592128 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -223,16 +223,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/client/packages.config b/cpp/test/Ice/inheritance/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj index 6aa2386f359..17d6371c33e 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -255,16 +255,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/server/packages.config b/cpp/test/Ice/inheritance/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj index a26091ce8b6..011d379bb9d 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj b/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj index 147cc12baad..2007bd5ea1d 100644 --- a/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -221,13 +221,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/interceptor/msbuild/client/packages.config b/cpp/test/Ice/interceptor/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/interceptor/msbuild/client/packages.config +++ b/cpp/test/Ice/interceptor/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj index db09f49eed3..a12f7f04e77 100644 --- a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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,13 +338,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/interceptor/msbuild/interceptortest/packages.config b/cpp/test/Ice/interceptor/msbuild/interceptortest/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/interceptor/msbuild/interceptortest/packages.config +++ b/cpp/test/Ice/interceptor/msbuild/interceptortest/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/interceptor/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/interceptor/msbuild/uwp/client/client.vcxproj index b333befabb4..06044f59ddc 100644 --- a/cpp/test/Ice/interceptor/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/interceptor/msbuild/uwp/client/packages.config b/cpp/test/Ice/interceptor/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/interceptor/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/interceptor/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj index dc1407e1d3f..3dcfaa4b41d 100644 --- a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -331,13 +331,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/client/packages.config b/cpp/test/Ice/invoke/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/invoke/msbuild/client/packages.config +++ b/cpp/test/Ice/invoke/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/server/packages.config b/cpp/test/Ice/invoke/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/invoke/msbuild/server/packages.config +++ b/cpp/test/Ice/invoke/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj index 8906760098b..b924877985b 100644 --- a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj index b235748e4d1..20f816eefeb 100644 --- a/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -223,16 +223,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/invoke/msbuild/uwp/client/packages.config b/cpp/test/Ice/invoke/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/invoke/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/invoke/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/uwp/server/packages.config b/cpp/test/Ice/invoke/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/invoke/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/invoke/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj index 6f337955dfc..99231f3b9e2 100644 --- a/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj index d5411c1ed5f..6fd76d08ed9 100644 --- a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj +++ b/cpp/test/Ice/library/msbuild/alltests/alltests.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -214,13 +214,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/alltests/packages.config b/cpp/test/Ice/library/msbuild/alltests/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/library/msbuild/alltests/packages.config +++ b/cpp/test/Ice/library/msbuild/alltests/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/client/client.vcxproj b/cpp/test/Ice/library/msbuild/client/client.vcxproj index fd727501de1..6b7e5551a62 100644 --- a/cpp/test/Ice/library/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/library/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -182,13 +182,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/client/packages.config b/cpp/test/Ice/library/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/library/msbuild/client/packages.config +++ b/cpp/test/Ice/library/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj b/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj index 0fb329aab04..3f8bcf4f68a 100644 --- a/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj +++ b/cpp/test/Ice/library/msbuild/consumer/consumer.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -214,13 +214,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/consumer/packages.config b/cpp/test/Ice/library/msbuild/consumer/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/library/msbuild/consumer/packages.config +++ b/cpp/test/Ice/library/msbuild/consumer/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj b/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj index 481b9760e98..26970ad5e45 100644 --- a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj +++ b/cpp/test/Ice/library/msbuild/gencode/gencode.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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,13 +297,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/gencode/packages.config b/cpp/test/Ice/library/msbuild/gencode/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/library/msbuild/gencode/packages.config +++ b/cpp/test/Ice/library/msbuild/gencode/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/client/client.vcxproj b/cpp/test/Ice/location/msbuild/client/client.vcxproj index 08a00a2a5d3..90f985e1deb 100644 --- a/cpp/test/Ice/location/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/location/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -331,13 +331,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/client/packages.config b/cpp/test/Ice/location/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/location/msbuild/client/packages.config +++ b/cpp/test/Ice/location/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/server/packages.config b/cpp/test/Ice/location/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/location/msbuild/server/packages.config +++ b/cpp/test/Ice/location/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/server/server.vcxproj b/cpp/test/Ice/location/msbuild/server/server.vcxproj index 1dd606faede..56de7268ed7 100644 --- a/cpp/test/Ice/location/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/location/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -334,13 +334,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj index 8c5a878d80a..b7ed9473ac6 100644 --- a/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -223,16 +223,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/location/msbuild/uwp/client/packages.config b/cpp/test/Ice/location/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/location/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/location/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/uwp/server/packages.config b/cpp/test/Ice/location/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/location/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/location/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj index d65aa3e2be5..b46618fc0b8 100644 --- a/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -261,16 +261,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj b/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj index 419f3d00c9d..076709ff55d 100644 --- a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client1/client1.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -99,10 +99,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client1/packages.config b/cpp/test/Ice/logger/msbuild/client1/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/logger/msbuild/client1/packages.config +++ b/cpp/test/Ice/logger/msbuild/client1/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj b/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj index f32a009e2b1..f592dbce1a1 100644 --- a/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client2/client2.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -99,10 +99,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client2/packages.config b/cpp/test/Ice/logger/msbuild/client2/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/logger/msbuild/client2/packages.config +++ b/cpp/test/Ice/logger/msbuild/client2/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj b/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj index cd8c02106ed..49aa928b91d 100644 --- a/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client3/client3.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -99,10 +99,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client3/packages.config b/cpp/test/Ice/logger/msbuild/client3/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/logger/msbuild/client3/packages.config +++ b/cpp/test/Ice/logger/msbuild/client3/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj b/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj index 6cf7a1239d8..13f1c2a0ea5 100644 --- a/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client4/client4.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -99,10 +99,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client4/packages.config b/cpp/test/Ice/logger/msbuild/client4/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/logger/msbuild/client4/packages.config +++ b/cpp/test/Ice/logger/msbuild/client4/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj b/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj index 620571ca9ea..d17c234cf40 100644 --- a/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client5/client5.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -99,10 +99,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client5/packages.config b/cpp/test/Ice/logger/msbuild/client5/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/logger/msbuild/client5/packages.config +++ b/cpp/test/Ice/logger/msbuild/client5/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj index d86cbf5fb9a..fded2668e55 100644 --- a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -334,13 +334,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/client/packages.config b/cpp/test/Ice/metrics/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/metrics/msbuild/client/packages.config +++ b/cpp/test/Ice/metrics/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj index e154ab3eaef..66e018f2232 100644 --- a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/collocated/collocated.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -337,13 +337,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/collocated/packages.config b/cpp/test/Ice/metrics/msbuild/collocated/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/metrics/msbuild/collocated/packages.config +++ b/cpp/test/Ice/metrics/msbuild/collocated/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/server/packages.config b/cpp/test/Ice/metrics/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/metrics/msbuild/server/packages.config +++ b/cpp/test/Ice/metrics/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj index bc23f6f521b..1e2d441534c 100644 --- a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/serveramd/packages.config b/cpp/test/Ice/metrics/msbuild/serveramd/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/metrics/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/metrics/msbuild/serveramd/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj index f437712c411..9591207af1a 100644 --- a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -340,13 +340,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj index afd4026c379..de983f7055b 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -254,16 +254,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/metrics/msbuild/uwp/client/packages.config b/cpp/test/Ice/metrics/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/metrics/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj index 4db086678c3..146f64080a5 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/metrics/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/metrics/msbuild/uwp/collocated/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/metrics/msbuild/uwp/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/uwp/server/packages.config b/cpp/test/Ice/metrics/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/metrics/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj index 2df26c0fdae..50ce637f559 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj index 3567b9419fa..b2a2abc4438 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -260,16 +260,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj index 879d3154182..742b6e437a5 100644 --- a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -249,10 +249,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -331,13 +331,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/client/packages.config b/cpp/test/Ice/networkProxy/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/networkProxy/msbuild/client/packages.config +++ b/cpp/test/Ice/networkProxy/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/server/packages.config b/cpp/test/Ice/networkProxy/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/networkProxy/msbuild/server/packages.config +++ b/cpp/test/Ice/networkProxy/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj index a9260331528..687f5d17d73 100644 --- a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -248,10 +248,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -330,13 +330,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/networkProxy/msbuild/uwp/client/client.vcxproj index 8e3de3ff29b..a5f1544287a 100644 --- a/cpp/test/Ice/networkProxy/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -223,16 +223,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/networkProxy/msbuild/uwp/client/packages.config b/cpp/test/Ice/networkProxy/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/networkProxy/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/networkProxy/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/uwp/server/packages.config b/cpp/test/Ice/networkProxy/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/networkProxy/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/networkProxy/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/networkProxy/msbuild/uwp/server/server.vcxproj index 5aa28ce4ff2..801147b6244 100644 --- a/cpp/test/Ice/networkProxy/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -258,16 +258,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/objects/msbuild/client/client.vcxproj index de97d25b517..2278b670d73 100644 --- a/cpp/test/Ice/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/objects/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -658,13 +658,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/client/packages.config b/cpp/test/Ice/objects/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/objects/msbuild/client/packages.config +++ b/cpp/test/Ice/objects/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj index 19fd8a5bdaf..1913a5bfb47 100644 --- a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/objects/msbuild/collocated/collocated.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -643,13 +643,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/collocated/packages.config b/cpp/test/Ice/objects/msbuild/collocated/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/objects/msbuild/collocated/packages.config +++ b/cpp/test/Ice/objects/msbuild/collocated/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/server/packages.config b/cpp/test/Ice/objects/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/objects/msbuild/server/packages.config +++ b/cpp/test/Ice/objects/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/server/server.vcxproj b/cpp/test/Ice/objects/msbuild/server/server.vcxproj index 77e3c3309bc..fc4a93e2a96 100644 --- a/cpp/test/Ice/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/objects/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -642,13 +642,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj index a08bd994da6..e7cc3fe4296 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -428,16 +428,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/objects/msbuild/uwp/client/packages.config b/cpp/test/Ice/objects/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/objects/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj index 35796b64a94..c81668b8f4b 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -429,16 +429,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/objects/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/objects/msbuild/uwp/collocated/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/objects/msbuild/uwp/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/uwp/server/packages.config b/cpp/test/Ice/objects/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/objects/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj index a4b0553dd2a..123afa58fad 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -433,16 +433,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/operations/msbuild/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/client/client.vcxproj index 5880f3f8375..cbbbaefc1df 100644 --- a/cpp/test/Ice/operations/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/operations/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -337,13 +337,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/client/packages.config b/cpp/test/Ice/operations/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/operations/msbuild/client/packages.config +++ b/cpp/test/Ice/operations/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj index d99122a83df..ece6187cb87 100644 --- a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/operations/msbuild/collocated/collocated.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -347,13 +347,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/collocated/packages.config b/cpp/test/Ice/operations/msbuild/collocated/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/operations/msbuild/collocated/packages.config +++ b/cpp/test/Ice/operations/msbuild/collocated/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/server/packages.config b/cpp/test/Ice/operations/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/operations/msbuild/server/packages.config +++ b/cpp/test/Ice/operations/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/server/server.vcxproj index e629d42850b..7356148b00a 100644 --- a/cpp/test/Ice/operations/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/operations/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -340,13 +340,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/serveramd/packages.config b/cpp/test/Ice/operations/msbuild/serveramd/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/operations/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/operations/msbuild/serveramd/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj index 84b4e9d4740..c97a5e9cd25 100644 --- a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -348,13 +348,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj index cbd322380fc..0ef1b6e7138 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/operations/msbuild/uwp/client/packages.config b/cpp/test/Ice/operations/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/operations/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj index 9ac14ee9362..703e6ba3818 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -267,16 +267,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/operations/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/operations/msbuild/uwp/collocated/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/operations/msbuild/uwp/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/uwp/server/packages.config b/cpp/test/Ice/operations/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/operations/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj index 314bcf69342..89ed91f8d13 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -265,16 +265,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/operations/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/operations/msbuild/uwp/serveramd/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/operations/msbuild/uwp/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj index b00c14e0cad..4da34e3213b 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -272,16 +272,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/optional/msbuild/client/client.vcxproj b/cpp/test/Ice/optional/msbuild/client/client.vcxproj index ada965bf72c..93f08bc8a3d 100644 --- a/cpp/test/Ice/optional/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/optional/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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,13 +336,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/client/packages.config b/cpp/test/Ice/optional/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/optional/msbuild/client/packages.config +++ b/cpp/test/Ice/optional/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/server/packages.config b/cpp/test/Ice/optional/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/optional/msbuild/server/packages.config +++ b/cpp/test/Ice/optional/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/server/server.vcxproj b/cpp/test/Ice/optional/msbuild/server/server.vcxproj index 544fc873c73..fd0821460d6 100644 --- a/cpp/test/Ice/optional/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/optional/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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,13 +336,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/serveramd/packages.config b/cpp/test/Ice/optional/msbuild/serveramd/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/optional/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/optional/msbuild/serveramd/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj index c5b69ef808f..5604209ed5d 100644 --- a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -344,13 +344,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj index 87a96eca268..31bc29dfd7b 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,15 +259,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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/optional/msbuild/uwp/client/packages.config b/cpp/test/Ice/optional/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/optional/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/uwp/server/packages.config b/cpp/test/Ice/optional/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/optional/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj index f77b52d54eb..c153969ee34 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -265,15 +265,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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/optional/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/optional/msbuild/uwp/serveramd/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/optional/msbuild/uwp/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj index 20df1d8a7d0..787f4c134a8 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -272,15 +272,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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj b/cpp/test/Ice/plugin/msbuild/client/client.vcxproj index fa5ad0b7e76..8ff9533b052 100644 --- a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/plugin/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -99,10 +99,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -146,13 +146,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/plugin/msbuild/client/packages.config b/cpp/test/Ice/plugin/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/plugin/msbuild/client/packages.config +++ b/cpp/test/Ice/plugin/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/plugin/msbuild/testplugin/packages.config b/cpp/test/Ice/plugin/msbuild/testplugin/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/plugin/msbuild/testplugin/packages.config +++ b/cpp/test/Ice/plugin/msbuild/testplugin/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj b/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj index 8f533c2fadf..68217a6a399 100644 --- a/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj +++ b/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -99,10 +99,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/properties/msbuild/client.vcxproj b/cpp/test/Ice/properties/msbuild/client.vcxproj index cd6cd65df98..6616f31a30f 100644 --- a/cpp/test/Ice/properties/msbuild/client.vcxproj +++ b/cpp/test/Ice/properties/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/properties/msbuild/packages.config b/cpp/test/Ice/properties/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/properties/msbuild/packages.config +++ b/cpp/test/Ice/properties/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj index 2341c633628..bb90cf05ca7 100644 --- a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -291,13 +291,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/client/packages.config b/cpp/test/Ice/proxy/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/proxy/msbuild/client/packages.config +++ b/cpp/test/Ice/proxy/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj index 92bd75a1767..c0a651e69dc 100644 --- a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/collocated/collocated.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -333,13 +333,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/collocated/packages.config b/cpp/test/Ice/proxy/msbuild/collocated/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/proxy/msbuild/collocated/packages.config +++ b/cpp/test/Ice/proxy/msbuild/collocated/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/server/packages.config b/cpp/test/Ice/proxy/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/proxy/msbuild/server/packages.config +++ b/cpp/test/Ice/proxy/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj index 2a4b297deb9..e5f75b391e3 100644 --- a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/serveramd/packages.config b/cpp/test/Ice/proxy/msbuild/serveramd/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/proxy/msbuild/serveramd/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj index 2f425106299..8315f08337d 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -340,13 +340,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj index 8df9373eb05..93fc02b8124 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -223,16 +223,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/proxy/msbuild/uwp/client/packages.config b/cpp/test/Ice/proxy/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/proxy/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj index 595535bca59..dbc459852d6 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -255,16 +255,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/proxy/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/proxy/msbuild/uwp/collocated/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/proxy/msbuild/uwp/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/uwp/server/packages.config b/cpp/test/Ice/proxy/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/proxy/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj index a13923354c2..2772daf1a92 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj index a0fddf81c48..d7ff54e5984 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -260,16 +260,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/retry/msbuild/client/client.vcxproj b/cpp/test/Ice/retry/msbuild/client/client.vcxproj index c2f15db5f43..53b7ee02ab6 100644 --- a/cpp/test/Ice/retry/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/retry/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -333,13 +333,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/client/packages.config b/cpp/test/Ice/retry/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/retry/msbuild/client/packages.config +++ b/cpp/test/Ice/retry/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj index b306cf96057..223d6c8f748 100644 --- a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/retry/msbuild/collocated/collocated.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -335,13 +335,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/collocated/packages.config b/cpp/test/Ice/retry/msbuild/collocated/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/retry/msbuild/collocated/packages.config +++ b/cpp/test/Ice/retry/msbuild/collocated/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/server/packages.config b/cpp/test/Ice/retry/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/retry/msbuild/server/packages.config +++ b/cpp/test/Ice/retry/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/server/server.vcxproj b/cpp/test/Ice/retry/msbuild/server/server.vcxproj index 69c84cd10e0..3dca45f9a95 100644 --- a/cpp/test/Ice/retry/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/retry/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -335,13 +335,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj index 7f487d16e6f..4cfd30b20ae 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -256,16 +256,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/retry/msbuild/uwp/client/packages.config b/cpp/test/Ice/retry/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/retry/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj index bd7d30bf6d4..972533dd929 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -258,16 +258,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/retry/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/retry/msbuild/uwp/collocated/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/retry/msbuild/uwp/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/uwp/server/packages.config b/cpp/test/Ice/retry/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/retry/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj index 2b644486725..2a612e83edd 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -262,16 +262,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj index d5819021cbf..49c09ba0899 100644 --- a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -291,13 +291,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/client/packages.config b/cpp/test/Ice/servantLocator/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/servantLocator/msbuild/client/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj index 3828b31274e..0a5f2848f84 100644 --- a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -335,13 +335,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config b/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/server/packages.config b/cpp/test/Ice/servantLocator/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/servantLocator/msbuild/server/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj index 60895951e0f..2d1bc9c762f 100644 --- a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -334,13 +334,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config b/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj index f222844bac9..96f8a30186b 100644 --- a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -342,13 +342,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/servantLocator/msbuild/uwp/client/client.vcxproj index 9f1e5d3d5fd..a0e6ba8ea99 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -261,16 +261,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/client/packages.config b/cpp/test/Ice/servantLocator/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/collocated.vcxproj index 5da55a55832..3c5b0b9f551 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/collocated.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -263,16 +263,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/server/packages.config b/cpp/test/Ice/servantLocator/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/servantLocator/msbuild/uwp/server/server.vcxproj index 44b54119222..d63387b0d97 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -267,16 +267,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/serveramd.vcxproj index 856b5f458e1..d9f424ceb7c 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -274,16 +274,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/services/msbuild/client.vcxproj b/cpp/test/Ice/services/msbuild/client.vcxproj index 2c8de98bf59..6b8b48da03b 100644 --- a/cpp/test/Ice/services/msbuild/client.vcxproj +++ b/cpp/test/Ice/services/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -339,13 +339,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/services/msbuild/packages.config b/cpp/test/Ice/services/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/services/msbuild/packages.config +++ b/cpp/test/Ice/services/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/services/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/services/msbuild/uwp/client/client.vcxproj index 4897a8d1985..c48557282cf 100644 --- a/cpp/test/Ice/services/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/services/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/services/msbuild/uwp/client/packages.config b/cpp/test/Ice/services/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/services/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/services/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj index d8bd3a2ad97..fc00dababb4 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -439,13 +439,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config b/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config b/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj index 55a97d9dc7c..d88411f8d23 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -480,13 +480,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj index dd4b28eaa71..310046752f7 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -488,13 +488,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/client.vcxproj index 6b6d257b433..b26812c5c57 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -347,16 +347,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/packages.config b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/packages.config b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/server.vcxproj index d8e24c03305..42e7903d3c5 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -353,16 +353,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj index 09feaf0b1c5..e872cccc50d 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -360,16 +360,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj index 55b9e1be242..d471df5b170 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -439,13 +439,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/client/packages.config b/cpp/test/Ice/slicing/objects/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/client/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/server/packages.config b/cpp/test/Ice/slicing/objects/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/server/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj index 59771270d7a..a02a827a821 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -480,13 +480,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config b/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj index 71a5c5b0ca1..80fb23b7c4e 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -488,13 +488,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/uwp/client/client.vcxproj index 9ee637afd20..64d9f7a2e1d 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -347,16 +347,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/slicing/objects/msbuild/uwp/client/packages.config b/cpp/test/Ice/slicing/objects/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/uwp/server/packages.config b/cpp/test/Ice/slicing/objects/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/uwp/server/server.vcxproj index d0e57b82594..167bdb335bd 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -353,16 +353,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/serveramd.vcxproj index 94fafd9e1bd..d91f6ce14dd 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -360,16 +360,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/stream/msbuild/client.vcxproj b/cpp/test/Ice/stream/msbuild/client.vcxproj index 6a899ddbf85..a3a7332252f 100644 --- a/cpp/test/Ice/stream/msbuild/client.vcxproj +++ b/cpp/test/Ice/stream/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -314,13 +314,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/stream/msbuild/packages.config b/cpp/test/Ice/stream/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/stream/msbuild/packages.config +++ b/cpp/test/Ice/stream/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj b/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj index c7da254b510..72b9b450d90 100644 --- a/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj +++ b/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -252,16 +252,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/stream/msbuild/uwp/packages.config b/cpp/test/Ice/stream/msbuild/uwp/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/stream/msbuild/uwp/packages.config +++ b/cpp/test/Ice/stream/msbuild/uwp/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj index c64ac5c23ab..41e2f719c89 100644 --- a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -290,13 +290,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/client/packages.config b/cpp/test/Ice/stringConverter/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/stringConverter/msbuild/client/packages.config +++ b/cpp/test/Ice/stringConverter/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/server/packages.config b/cpp/test/Ice/stringConverter/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/stringConverter/msbuild/server/packages.config +++ b/cpp/test/Ice/stringConverter/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj index 95474a35a8e..a40c07962ef 100644 --- a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -330,13 +330,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/stringConverter/msbuild/uwp/client/client.vcxproj index b2c5652a505..4a67038e1ae 100644 --- a/cpp/test/Ice/stringConverter/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -222,16 +222,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/stringConverter/msbuild/uwp/client/packages.config b/cpp/test/Ice/stringConverter/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/stringConverter/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/stringConverter/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/uwp/server/packages.config b/cpp/test/Ice/stringConverter/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/stringConverter/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/stringConverter/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/stringConverter/msbuild/uwp/server/server.vcxproj index fe9b1ce02ee..a1f3397ad50 100644 --- a/cpp/test/Ice/stringConverter/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -257,16 +257,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj index 78ef6264ace..f2f2475c483 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -291,13 +291,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/client/packages.config b/cpp/test/Ice/threadPoolPriority/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/client/packages.config +++ b/cpp/test/Ice/threadPoolPriority/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config b/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config +++ b/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj index a8f241d6472..f9d0aa15db3 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/packages.config b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/packages.config +++ b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj index d6edcf196f0..badbb1699ab 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj b/cpp/test/Ice/timeout/msbuild/client/client.vcxproj index fb4448da583..362a4a1934a 100644 --- a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -333,13 +333,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/client/packages.config b/cpp/test/Ice/timeout/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/timeout/msbuild/client/packages.config +++ b/cpp/test/Ice/timeout/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/server/packages.config b/cpp/test/Ice/timeout/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/timeout/msbuild/server/packages.config +++ b/cpp/test/Ice/timeout/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj index 6adbd151439..9c4005d1ed0 100644 --- a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj index 24a69a8c653..ea3bf914165 100644 --- a/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -254,16 +254,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/timeout/msbuild/uwp/client/packages.config b/cpp/test/Ice/timeout/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/timeout/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/timeout/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/uwp/server/packages.config b/cpp/test/Ice/timeout/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/timeout/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/timeout/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj index e65bdc7eac0..c9a44805a02 100644 --- a/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/udp/msbuild/client/client.vcxproj b/cpp/test/Ice/udp/msbuild/client/client.vcxproj index b7deda63187..de204d81ae9 100644 --- a/cpp/test/Ice/udp/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/udp/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -291,13 +291,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/client/packages.config b/cpp/test/Ice/udp/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/udp/msbuild/client/packages.config +++ b/cpp/test/Ice/udp/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/server/packages.config b/cpp/test/Ice/udp/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Ice/udp/msbuild/server/packages.config +++ b/cpp/test/Ice/udp/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/server/server.vcxproj b/cpp/test/Ice/udp/msbuild/server/server.vcxproj index 999705ea649..c196bb8491b 100644 --- a/cpp/test/Ice/udp/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/udp/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj index 22ef87de1a8..d4450ac0356 100644 --- a/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -253,15 +253,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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/udp/msbuild/uwp/client/packages.config b/cpp/test/Ice/udp/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/udp/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/udp/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/uwp/server/packages.config b/cpp/test/Ice/udp/msbuild/uwp/server/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/Ice/udp/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/udp/msbuild/uwp/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj index 7d066d19cb2..f61d5baeda7 100644 --- a/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -259,16 +259,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj index a2d1ded44ca..6f169f0769f 100644 --- a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -331,13 +331,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceBox/admin/msbuild/client/packages.config b/cpp/test/IceBox/admin/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceBox/admin/msbuild/client/packages.config +++ b/cpp/test/IceBox/admin/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceBox/admin/msbuild/testservice/packages.config b/cpp/test/IceBox/admin/msbuild/testservice/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceBox/admin/msbuild/testservice/packages.config +++ b/cpp/test/IceBox/admin/msbuild/testservice/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj index bcab2f71a3e..e513632ca05 100644 --- a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/testservice/testservice.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -250,10 +250,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -356,13 +356,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj b/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj index 9eaf5a007b6..6b3076bf3b1 100644 --- a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -331,13 +331,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceBox/configuration/msbuild/client/packages.config b/cpp/test/IceBox/configuration/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceBox/configuration/msbuild/client/packages.config +++ b/cpp/test/IceBox/configuration/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceBox/configuration/msbuild/testservice/packages.config b/cpp/test/IceBox/configuration/msbuild/testservice/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceBox/configuration/msbuild/testservice/packages.config +++ b/cpp/test/IceBox/configuration/msbuild/testservice/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj index 6681ed7e1b7..58ac979b30f 100644 --- a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -250,10 +250,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -356,13 +356,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj b/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj index 11c8b757188..cc3272921cd 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -315,13 +315,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceDiscovery/simple/msbuild/client/packages.config b/cpp/test/IceDiscovery/simple/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/client/packages.config +++ b/cpp/test/IceDiscovery/simple/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceDiscovery/simple/msbuild/server/packages.config b/cpp/test/IceDiscovery/simple/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/server/packages.config +++ b/cpp/test/IceDiscovery/simple/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj index aecf2d72e78..241b496383d 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -340,13 +340,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj index 394614f4562..86686ef018b 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -286,11 +286,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/packages.config +++ b/cpp/test/IceGrid/activation/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/packages.config +++ b/cpp/test/IceGrid/activation/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 ac42e1ed0a3..b6cbecdf842 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/admin/msbuild/packages.config +++ b/cpp/test/IceGrid/admin/msbuild/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 a96769847e4..a7fbf8e83cd 100644 --- a/cpp/test/IceGrid/admin/msbuild/server.vcxproj +++ b/cpp/test/IceGrid/admin/msbuild/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -95,9 +95,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -176,11 +176,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 f5f64efeeff..a5a2155fccc 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -286,11 +286,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 179c149c74a..6b98b6f4ab1 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 d197686d1a2..c1a9fa330c3 100644 --- a/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -176,11 +176,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 b6a15153586..a88bc26d868 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -286,11 +286,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 ac3f9ac8912..091ee143eaf 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 718e0f2f20d..1f24c1d606d 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -351,11 +351,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 7b59becc8f8..ff88b61b107 100644 --- a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -286,11 +286,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/distribution/msbuild/client/packages.config +++ b/cpp/test/IceGrid/distribution/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/distribution/msbuild/server/packages.config +++ b/cpp/test/IceGrid/distribution/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 52bb5eb2f7b..d4d109287da 100644 --- a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 144559efc0a..4c03d93a1d7 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -286,11 +286,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 0d5680f8962..a9d04386dac 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 79c07e8d4b8..0b54e7e3e65 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -351,11 +351,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 d685fd8303e..ab78c55ac02 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -286,11 +286,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 584de0940ff..675b3bbb562 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -95,9 +95,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -176,11 +176,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 1ace97b1f0c..e5131c5c169 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 dc4016535ee..0eed42d02e1 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -351,11 +351,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 bcad0f1d475..6313456485c 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -286,11 +286,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/packages.config +++ b/cpp/test/IceGrid/replication/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/packages.config +++ b/cpp/test/IceGrid/replication/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 a7e5b68e4bd..69bef7926a8 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 1426fd6b150..64bc4dc4992 100644 --- a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -286,11 +286,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/session/msbuild/client/packages.config +++ b/cpp/test/IceGrid/session/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/session/msbuild/server/packages.config +++ b/cpp/test/IceGrid/session/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 a7f2ab88b9e..1f69a70ca71 100644 --- a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/packages.config +++ b/cpp/test/IceGrid/session/msbuild/verifier/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 5ca8fc8564a..999fa14ad88 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 a8698eb2a81..cc5b8b1a143 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -310,11 +310,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/packages.config +++ b/cpp/test/IceGrid/simple/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/packages.config +++ b/cpp/test/IceGrid/simple/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 d43eae05acf..d850063c4c2 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 e38f9c1a889..b9672a3ad63 100644 --- a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -310,11 +310,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/update/msbuild/client/packages.config +++ b/cpp/test/IceGrid/update/msbuild/client/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceGrid/update/msbuild/server/packages.config +++ b/cpp/test/IceGrid/update/msbuild/server/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" 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 36febe1f0fd..9be55c8d43e 100644 --- a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,9 +89,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -327,11 +327,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj index 91f1dc1db00..68706adb83c 100644 --- a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/client/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -331,13 +331,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/client/packages.config b/cpp/test/IceSSL/configuration/msbuild/client/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceSSL/configuration/msbuild/client/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj index 050f10487ff..190ef22b769 100644 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj @@ -1,7 +1,7 @@ <?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.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -88,8 +88,8 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -349,10 +349,10 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config index 7d3fe792d98..1a364f2d316 100644 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> <package id="zeroc.openssl.v140" version="1.0.2.2" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/server/packages.config b/cpp/test/IceSSL/configuration/msbuild/server/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceSSL/configuration/msbuild/server/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj index 8e38859aacf..374ea96b954 100644 --- a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/server/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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -332,13 +332,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config index 7d3fe792d98..1a364f2d316 100644 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> <package id="zeroc.openssl.v140" version="1.0.2.2" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj index 5026efd28ce..db4d4c2637a 100644 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj @@ -1,7 +1,7 @@ <?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.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -88,8 +88,8 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -355,10 +355,10 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj b/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj index 863077b2894..4784039678a 100644 --- a/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -79,10 +79,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.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" /> @@ -253,16 +253,16 @@ <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config b/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation/msbuild/publisher/packages.config b/cpp/test/IceStorm/federation/msbuild/publisher/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/federation/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/federation/msbuild/publisher/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj index a3684e594c3..d1a021701d1 100644 --- a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -285,11 +285,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config b/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj index 1233a36bc31..f1cf739180c 100644 --- a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config b/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj index b9861286348..d9301445ed9 100644 --- a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -285,11 +285,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config b/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj index 48f50f26109..e9b351cc5a9 100644 --- a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config b/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj index ccd227629c9..8c2674a298a 100644 --- a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -285,11 +285,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/sub/packages.config b/cpp/test/IceStorm/rep1/msbuild/sub/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/rep1/msbuild/sub/packages.config +++ b/cpp/test/IceStorm/rep1/msbuild/sub/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj index 9b9daebd730..be4aa8ef9f7 100644 --- a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config b/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj index 832440ec1e7..3b3c20be912 100644 --- a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj index 0332100179d..dce3b478544 100644 --- a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj +++ b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -285,11 +285,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/repgrid/msbuild/packages.config b/cpp/test/IceStorm/repgrid/msbuild/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/repgrid/msbuild/packages.config +++ b/cpp/test/IceStorm/repgrid/msbuild/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj index c80c03e0022..fb21bcb3720 100644 --- a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -389,9 +389,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -470,11 +470,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/control/packages.config b/cpp/test/IceStorm/repstress/msbuild/control/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/repstress/msbuild/control/packages.config +++ b/cpp/test/IceStorm/repstress/msbuild/control/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config b/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj index d4f04148c89..c56a7a7ec77 100644 --- a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -389,9 +389,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -430,11 +430,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config b/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj index 0de7f3943e8..1be195c255c 100644 --- a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -389,9 +389,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -470,11 +470,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/single/msbuild/publisher/packages.config b/cpp/test/IceStorm/single/msbuild/publisher/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/single/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/single/msbuild/publisher/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj index 794bd6a1832..bd46dfc5a15 100644 --- a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -285,11 +285,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/single/msbuild/subscriber/packages.config b/cpp/test/IceStorm/single/msbuild/subscriber/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/single/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/single/msbuild/subscriber/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj index 208f4af3227..7fb362dd799 100644 --- a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/stress/msbuild/publisher/packages.config b/cpp/test/IceStorm/stress/msbuild/publisher/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/stress/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/stress/msbuild/publisher/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj index 1e4eae212f8..fc159a3a85a 100644 --- a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -285,11 +285,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config b/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config index 326f4a0605e..c9c29a614f3 100644 --- a/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj index a42bd21e20d..76fbf1bc23d 100644 --- a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj @@ -1,8 +1,8 @@ <?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.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -244,9 +244,9 @@ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.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" /> @@ -325,11 +325,11 @@ <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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj b/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj index f7cfe05a538..b2a9af48dda 100644 --- a/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj +++ b/cpp/test/IceUtil/condvar/msbuild/match/match.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -99,10 +99,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceUtil/condvar/msbuild/match/packages.config b/cpp/test/IceUtil/condvar/msbuild/match/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceUtil/condvar/msbuild/match/packages.config +++ b/cpp/test/IceUtil/condvar/msbuild/match/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceUtil/condvar/msbuild/workqueue/packages.config b/cpp/test/IceUtil/condvar/msbuild/workqueue/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceUtil/condvar/msbuild/workqueue/packages.config +++ b/cpp/test/IceUtil/condvar/msbuild/workqueue/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj b/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj index 5ebdaa87bbb..ec7ffce7624 100644 --- a/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj +++ b/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -99,10 +99,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj b/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj index c16a09f8eb0..f5d53c12560 100644 --- a/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/ctrlCHandler/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config b/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config +++ b/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj b/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj index 44dcdeb90a5..33dac1432d1 100644 --- a/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/inputUtil/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceUtil/inputUtil/msbuild/packages.config b/cpp/test/IceUtil/inputUtil/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceUtil/inputUtil/msbuild/packages.config +++ b/cpp/test/IceUtil/inputUtil/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceUtil/priority/msbuild/client.vcxproj b/cpp/test/IceUtil/priority/msbuild/client.vcxproj index 5f7a43c0c94..f7ec35081f9 100644 --- a/cpp/test/IceUtil/priority/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/priority/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -193,13 +193,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceUtil/priority/msbuild/packages.config b/cpp/test/IceUtil/priority/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceUtil/priority/msbuild/packages.config +++ b/cpp/test/IceUtil/priority/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceUtil/sha1/msbuild/client.vcxproj b/cpp/test/IceUtil/sha1/msbuild/client.vcxproj index 862499e07c6..5491c39977c 100644 --- a/cpp/test/IceUtil/sha1/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/sha1/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceUtil/sha1/msbuild/packages.config b/cpp/test/IceUtil/sha1/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceUtil/sha1/msbuild/packages.config +++ b/cpp/test/IceUtil/sha1/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX index c13c415f2c5..ae24a0d3efa 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX +++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX @@ -1,4 +1,4 @@ - 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b0.dylib + 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.0.dylib 1 (anonymous namespace)::Thrower::fifth in client 2 (anonymous namespace)::Thrower::forth in client 3 (anonymous namespace)::Thrower::third in client diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX index a12df8bfb7f..dcd6012dde0 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX +++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX @@ -1,7 +1,7 @@ - 0 IceUtil::Exception::Exception(char const*, int) in libIce.3.7b0.dylib - 1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper(char const*, int) in libIce.3.7b0.dylib - 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b0.dylib - 3 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b0.dylib + 0 IceUtil::Exception::Exception(char const*, int) in libIce.3.7.0.dylib + 1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper(char const*, int) in libIce.3.7.0.dylib + 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.0.dylib + 3 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.0.dylib 4 (anonymous namespace)::Thrower::fifth() in client 5 (anonymous namespace)::Thrower::forth() in client 6 (anonymous namespace)::Thrower::third() in client diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX index f65884c5f5c..12c564a851b 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX @@ -1,3 +1,3 @@ - 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b0.dylib + 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.0.dylib 1 main in client 2 start in libdyld.dylib
\ No newline at end of file diff --git a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj index 7a44b52a195..29824904004 100644 --- a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/stacktrace/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -205,13 +205,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceUtil/stacktrace/msbuild/packages.config b/cpp/test/IceUtil/stacktrace/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceUtil/stacktrace/msbuild/packages.config +++ b/cpp/test/IceUtil/stacktrace/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceUtil/thread/msbuild/client.vcxproj b/cpp/test/IceUtil/thread/msbuild/client.vcxproj index 6d4b3f0f4c2..b0cdb5a8215 100644 --- a/cpp/test/IceUtil/thread/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/thread/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -205,13 +205,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceUtil/thread/msbuild/packages.config b/cpp/test/IceUtil/thread/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceUtil/thread/msbuild/packages.config +++ b/cpp/test/IceUtil/thread/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceUtil/timer/msbuild/client.vcxproj b/cpp/test/IceUtil/timer/msbuild/client.vcxproj index 6fe83be8c9f..df82883fd03 100644 --- a/cpp/test/IceUtil/timer/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/timer/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceUtil/timer/msbuild/packages.config b/cpp/test/IceUtil/timer/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceUtil/timer/msbuild/packages.config +++ b/cpp/test/IceUtil/timer/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceUtil/unicode/msbuild/client.vcxproj b/cpp/test/IceUtil/unicode/msbuild/client.vcxproj index 837e4bd0ecc..c17c38bf44e 100644 --- a/cpp/test/IceUtil/unicode/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/unicode/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceUtil/unicode/msbuild/packages.config b/cpp/test/IceUtil/unicode/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceUtil/unicode/msbuild/packages.config +++ b/cpp/test/IceUtil/unicode/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceUtil/uuid/msbuild/client.vcxproj b/cpp/test/IceUtil/uuid/msbuild/client.vcxproj index 487a1541090..4fd83f5d4d0 100644 --- a/cpp/test/IceUtil/uuid/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/uuid/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -181,13 +181,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceUtil/uuid/msbuild/packages.config b/cpp/test/IceUtil/uuid/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/IceUtil/uuid/msbuild/packages.config +++ b/cpp/test/IceUtil/uuid/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Slice/escape/msbuild/client.vcxproj b/cpp/test/Slice/escape/msbuild/client.vcxproj index 1baee67dc15..9d2e4c6e185 100644 --- a/cpp/test/Slice/escape/msbuild/client.vcxproj +++ b/cpp/test/Slice/escape/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -475,13 +475,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Slice/escape/msbuild/packages.config b/cpp/test/Slice/escape/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Slice/escape/msbuild/packages.config +++ b/cpp/test/Slice/escape/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Slice/macros/msbuild/client.vcxproj b/cpp/test/Slice/macros/msbuild/client.vcxproj index d205caeb065..3161b4c8942 100644 --- a/cpp/test/Slice/macros/msbuild/client.vcxproj +++ b/cpp/test/Slice/macros/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -330,13 +330,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Slice/macros/msbuild/packages.config b/cpp/test/Slice/macros/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Slice/macros/msbuild/packages.config +++ b/cpp/test/Slice/macros/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Slice/parser/msbuild/client.vcxproj b/cpp/test/Slice/parser/msbuild/client.vcxproj index a2504909b81..1e45c64f7fb 100644 --- a/cpp/test/Slice/parser/msbuild/client.vcxproj +++ b/cpp/test/Slice/parser/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -392,10 +392,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -477,13 +477,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Slice/parser/msbuild/packages.config b/cpp/test/Slice/parser/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Slice/parser/msbuild/packages.config +++ b/cpp/test/Slice/parser/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Slice/structure/msbuild/client.vcxproj b/cpp/test/Slice/structure/msbuild/client.vcxproj index e1c42391246..ca0c01c0aab 100644 --- a/cpp/test/Slice/structure/msbuild/client.vcxproj +++ b/cpp/test/Slice/structure/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -330,13 +330,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Slice/structure/msbuild/packages.config b/cpp/test/Slice/structure/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Slice/structure/msbuild/packages.config +++ b/cpp/test/Slice/structure/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj index 20ded70d8f5..bc90b20dd61 100644 --- a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj +++ b/cpp/test/Slice/utf8BOM/msbuild/client.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.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -93,10 +93,10 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.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" /> @@ -329,13 +329,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.0-beta0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-beta0\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-beta0\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0-beta0\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0-beta0\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.0\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.0\build\native\zeroc.ice.v100.targets') )" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Slice/utf8BOM/msbuild/packages.config b/cpp/test/Slice/utf8BOM/msbuild/packages.config index 4e455c793f9..4688b2081a6 100644 --- a/cpp/test/Slice/utf8BOM/msbuild/packages.config +++ b/cpp/test/Slice/utf8BOM/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.0-beta0" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.0" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/uwp/controller/msbuild/controller.vcxproj b/cpp/test/uwp/controller/msbuild/controller.vcxproj index 5d98489f8a7..db674c61757 100644 --- a/cpp/test/uwp/controller/msbuild/controller.vcxproj +++ b/cpp/test/uwp/controller/msbuild/controller.vcxproj @@ -1,7 +1,7 @@ <?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.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <PropertyGroup Label="Globals"> <ProjectGuid>{194C78A4-129A-4947-B891-2B538DB72C07}</ProjectGuid> <RootNamespace>uwp</RootNamespace> @@ -1884,25 +1884,25 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'"> <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.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0-beta0\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0-beta0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.0\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.0\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.0\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.0\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.0\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.0\build\native\zeroc.ice.uwp.v140.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/uwp/controller/msbuild/packages.config b/cpp/test/uwp/controller/msbuild/packages.config index 8a846c6ada1..1430106eebd 100644 --- a/cpp/test/uwp/controller/msbuild/packages.config +++ b/cpp/test/uwp/controller/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.0-beta0" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.0-beta0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.0" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.0" targetFramework="native" /> </packages>
\ No newline at end of file |